# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created  Mon Dec 22 01:41:57 UTC 2014
# ------------------------------------------------------------------------------
# CHANGES                               |   62 
# PACKAGE/debian/changelog              |    4 
# PACKAGE/lynx.iss                      |    8 
# PACKAGE/lynx.nsi                      |    6 
# PACKAGE/lynx.spec                     |    4 
# PACKAGE/version.iss                   |    6 
# WWW/Library/Implementation/HTFTP.c    |    6 
# WWW/Library/Implementation/HTFile.c   |    6 
# WWW/Library/Implementation/HTFormat.c |    4 
# WWW/Library/Implementation/HTMIME.c   |    8 
# WWW/Library/Implementation/HTPlain.c  |  157 
# WWW/Library/Implementation/HTTCP.c    |  106 
# WWW/Library/Implementation/HTTCP.h    |   25 
# WWW/Library/Implementation/HTTP.c     |    6 
# WWW/Library/Implementation/SGML.c     | 1939 ++---
# WWW/Library/Implementation/UCAux.h    |   19 
# WWW/Library/Implementation/UCMap.h    |    6 
# aclocal.m4                            |  134 
# config.guess                          |  160 
# config.hin                            |    3 
# config.sub                            |   21 
# configure                             |11238 +++++++++++++++++---------------
# configure.in                          |    6 
# lynx.cfg                              |    6 
# makefile.in                           |    4 
# po/eo.po                              |  198 
# po/id.po                              | 2484 +++----
# po/makefile.inn                       |   11 
# src/GridText.c                        |  156 
# src/HTML.c                            |    5 
# src/LYCgi.c                           |    8 
# src/LYCharSets.c                      |    4 
# src/LYCharUtils.c                     |    9 
# src/LYCookie.c                        |    7 
# src/LYCurses.c                        |    7 
# src/LYIcon.rc                         |   10 
# src/LYKeymap.c                        |   59 
# src/LYLocal.c                         |    5 
# src/LYMainLoop.c                      |   32 
# src/LYOptions.c                       |    4 
# src/LYPrint.c                         |   11 
# src/LYStrings.c                       |   13 
# src/LYStrings.h                       |    4 
# src/LYUtils.c                         |   35 
# src/LYUtils.h                         |    9 
# src/TRSTable.c                        |   65 
# src/UCAux.c                           |  151 
# src/UCdomap.c                         |   36 
# src/makefile.in                       |    3 
# src/tidy_tls.c                        |   15 
# userdefs.h                            |    6 
# 51 files changed, 9091 insertions(+), 8200 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- 2.8.9dev.1/CHANGES	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/CHANGES	Mon Dec 22 01:39:40 2014
@@ -1,8 +1,62 @@
--- $LynxId: CHANGES,v 1.746 2014/03/12 18:39:52 tom Exp $
+-- $LynxId: CHANGES,v 1.766 2014/12/21 21:30:08 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2014-12-21 (2.8.9dev.2)
+* correct an inconsistent check for reload using isLYNXCGI() in the
+  options-screen -TD
+* add script after using msginit to create en.po, to work around renaming in
+  Cygwin environment -TD
+* improve overlay of field contents in form for "-dump" option; the change
+  in 2.8.8dev.3 did not take into account UTF-8 values (Debian #770011) -TD
+* correct a bug in the map_string_to_keysym() function introduced in
+  2.8.8dev.17:  as used via the remap() function, this returns the curses
+  code for a special key rather than Lynx's internal code (Debian #769601) -TD
+* add checks when translating from UTF-8 to Unicode, to ensure that only the
+  shortest encoding is accepted.  Other/longer encodings are mapped to the UCS
+  replacement character as in xterm (Debian #763268) -TD
+* modify LYExpandHostForURL() to call HTGetAddrInfo(), allowing DNS lookups
+  for IPv6 to be interrupted, e.g., by typing ^G.  This was a path overlooked
+  in 2.8.8dev.13 (reports by Chad Kline, etc.) -TD
+* drop libgnutls-extra when using --with-gnutls-compat option -TD
+* drop libgcrypt dependency when building with gnutls, using gnutls_rnd()
+  rather than gcry_randomize() (adapted from patch by Andreas Metzler,
+  Debian #753699) -TD
+* fix a reference-after-free in scan_cookie_sublist(), probably fixing RedHat
+  #1120925 (patch by Mike Gorse).
+* update eo.po, id.po from
+    http://translationproject.org/latest/lynx
+* improve workaround for too-long pathnames in LYPrint.c SetupFilename() -TD
+* fix a few inconsistencies between #if / #ifdef, including one for sleep()
+  which broke cross-compiles for MinGW -TD
+* updated/improved configure script macros (TD):
+  + CF_ACVERSION_CHECK:  work around another gratuitous incompatibility
+    introduced in 2.69 (reported by Ross Burton, openembedded.org)
+  + CF_ADD_CFLAGS:  workaround for ash-shell
+  + CF_ADD_LIBS:  workaround in CF_X_TOOLKIT uses pkgconfig, whose files
+    generally are using incomplete dependencies - in turn introducing lots of
+    duplication.  filter out the duplicates.
+  + CF_CHECK_CFLAGS:  workaround for ash-shell
+  + CF_CURSES_FUNCS:  improve workaround for weak-linkage, seems to fix tests
+    with NetBSD 6.1
+  + CF_INTEL_COMPILER:  cleanup the -no-gcc option which was leftover from
+    testing - prcs does not build with this option.
+  + CF_MAKEFLAGS:  workaround for GNU make 4.0 incompatibility with previous
+    releases.
+  + CF_SUBDIR_PATH:  add /usr/pkg and /opt/local to help configuring with
+    pkgsrc and macports -TD
+  + CF_XOPEN_SOURCE:  Minix3.2 ifdef's the POSIX.1-2001 functions inside
+    _NETBSD_SOURCE, even though it was released 2012-02-29 - appease it.  At
+    the same time, turn on the verbose flag to show that most platforms need
+    platform-specific define's to get POSIX (sic).  Also, add case for UnixWare
+    (report/discussion with Mark Ryan).
+  + CF_X_ATHENA:  add --with-Xaw3dxft option
+  + CF_X_TOOLKIT:  add workaround for breakage in XQuartz upgrades
+* add check to ensure that "submit" command from 2.8.8dev.10 is performed
+  in a form (report by Karen Lewellen) -TD
+* update config.guess (2014-03-23), config.sub (2014-07-28)
+
 2014-03-12 (2.8.9dev.1)
 
 2014-03-09 (2.8.8rel.2)
@@ -187,7 +241,7 @@
 * protect redefined errno values for Windows port from redefinition warnings
   when using MinGW build, since the WSAxxx values are what the configuration
   actually uses -TD
-* modify <address> tag to treat it like <p> when used within a list -TD 
+* modify <address> tag to treat it like <p> when used within a list -TD
 * update fi.po from
     http://translationproject.org/latest/lynx
 * add on/off toggles to options menu for the color-style and default-colors
@@ -636,7 +690,7 @@
 * promote some experimental options to normal, tidy up related EXP_xxx vs
   USE_xxx symbols -TD
   EXP_ASCII_CTYPES is now USE_ASCII_CTYPES
-  EXP_JUSTIFY_ELTS is now USE_JUSTIFY_ELTS 
+  EXP_JUSTIFY_ELTS is now USE_JUSTIFY_ELTS
   EXP_CHARSET_CHOICE is now USE_CHARSET_CHOICE
   The scrollbar, progressbar, sessions and session-cache options are now
   enabled by default.
@@ -664,7 +718,7 @@
 * add <sys/types.h> include in socklen_t configure check (from OpenBSD CVS)
 * eliminate UCPutUtf8ToBuffer() - redundant -TD
 * use memset's to simplify some initialization in HTML.c, extending a change
-  made in 2.8.7dev.10 (prompted by issue in OpenBSD) -TD 
+  made in 2.8.7dev.10 (prompted by issue in OpenBSD) -TD
 * add optional support for IDNA using GNU libidn (Debian #352596) -TD
 * ignore LEFT-TO-RIGHT-MARK (U+200E) in HTML files (Debian #408835) -TD
 * correct check for return-value from gnutls_certificate_verify_peers2(), which
Index: PACKAGE/debian/changelog
--- 2.8.9dev.1/PACKAGE/debian/changelog	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/PACKAGE/debian/changelog	Mon Dec 22 01:39:40 2014
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.1) unstable; urgency=low
+lynx-dev (2.8.9dev.2) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Mar 2014 17:44:33 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Mar 2014 11:03:40 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
Index: PACKAGE/lynx.iss
--- 2.8.9dev.1/PACKAGE/lynx.iss	Sat Jan 11 19:06:15 2014
+++ 2.8.9dev.2/PACKAGE/lynx.iss	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.12 2014/01/09 00:26:08 tom Exp $
+; $LynxId: lynx.iss,v 1.13 2014/12/22 00:44:43 tom Exp $
 ; vile:ts=2 sw=2 notabinsert
 ;
 ; This is the BASE script for different flavors of the installer for Lynx.
@@ -87,7 +87,7 @@
 #define LYNX_TARGET0 StringChange(LYNX_VERSION,LYNX_RELEASE + "rel.",LYNX_RELEASE + ".00")
 #define LYNX_TARGET1 StringChange(LYNX_TARGET0,LYNX_TARGETS + "dev.",LYNX_RELEASE + ".10")
 #define LYNX_TARGET2 StringChange(LYNX_TARGET1,LYNX_TARGETS + "pre.",LYNX_RELEASE + ".20")
-#emit 'VersionInfoVersion=' + LYNX_TARGET2
+#emit 'VersionInfoVersion=' + LYNX_TARGET1
 AppVerName={#MyAppVerName}
 AppPublisher={#MyAppPublisher}
 AppCopyright=© 1997-2013,2014, Thomas E. Dickey
@@ -139,8 +139,8 @@
 #emit 'Source: "' + DllsSrcDir + '\' + BzipExeName + '"; DestDir: "{app}"; DestName: ' + BzipExeName + '; Flags: ignoreversion'
 #emit 'Source: "' + DllsSrcDir + '\' + GzipExeName + '"; DestDir: "{app}"; DestName: ' + GzipExeName + '; Flags: ignoreversion'
 #emit 'Source: "' + DocsSrcDir + '\*.*"; DestDir: "{app}\doc"; Flags: '
-#emit 'Source: "' + DocsSrcDir + '\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '
-#emit 'Source: "' + DocsSrcDir + '\test\*.*"; DestDir: "{app}\doc\test"; Flags: '
+#emit 'Source: "' + DocsSrcDir + '\..\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '
+#emit 'Source: "' + DocsSrcDir + '\..\test\*.*"; DestDir: "{app}\doc\test"; Flags: '
 #emit 'Source: "' + HelpSrcDir + '\*.*"; DestDir: "{app}\help"; Flags: '
 #emit 'Source: "' + HelpSrcDir + '\keystrokes\*.*"; DestDir: "{app}\help\keystrokes"; Flags: '
 
Index: PACKAGE/lynx.nsi
--- 2.8.9dev.1/PACKAGE/lynx.nsi	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/PACKAGE/lynx.nsi	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.18 2014/03/10 21:44:33 tom Exp $
+; $LynxId: lynx.nsi,v 1.19 2014/03/16 15:03:40 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 "1001"
-!define VERSION_PATCH "dev.1"
+!define VERSION_LEVEL "1002"
+!define VERSION_PATCH "dev.2"
 
 !define SUBKEY "Lynx"
 
Index: PACKAGE/lynx.spec
--- 2.8.9dev.1/PACKAGE/lynx.spec	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/PACKAGE/lynx.spec	Mon Dec 22 01:39:40 2014
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.26 2014/03/10 21:44:33 tom Exp $
+# $LynxId: lynx.spec,v 1.27 2014/03/16 15:03:40 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.1
+Release: dev.2
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
Index: PACKAGE/version.iss
--- 2.8.9dev.1/PACKAGE/version.iss	Fri Feb 14 14:06:34 2014
+++ 2.8.9dev.2/PACKAGE/version.iss	Mon Dec 22 01:39:40 2014
@@ -1,11 +1,11 @@
 ; version used for Inno Setup files.
 
 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
-#define LYNX_VERSION "2.8.9dev.1"
+#define LYNX_VERSION "2.8.9dev.2"
 
 ; most-recent full release and target
-#define LYNX_RELEASE "2.8.8"
-#define LYNX_TARGETS "2.8.8"
+#define LYNX_RELEASE "2.8.9"
+#define LYNX_TARGETS "2.8.9"
 
 #define MyAppName "Lynx - web browser"
 #define MyAppPublisher "Thomas E Dickey"
Index: WWW/Library/Implementation/HTFTP.c
--- 2.8.9dev.1/WWW/Library/Implementation/HTFTP.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/WWW/Library/Implementation/HTFTP.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.125 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTFTP.c,v 1.126 2014/07/24 22:08:24 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -159,7 +159,7 @@
 	    tag, \
 	    entry_info->filename, \
 	    NonNull(entry_info->date), \
-	    entry_info->size))
+	    CAST_off_t(entry_info->size)))
 
 struct _HTStructured {
     const HTStructuredClass *isa;
@@ -2717,7 +2717,7 @@
 
 	HTSprintf(bufp, fmt, value);
     } else {
-	sprintf(fmt, "%" PRI_off_t, value);
+	sprintf(fmt, "%" PRI_off_t, CAST_off_t (value));
 
 	StrAllocCat(*bufp, fmt);
     }
Index: WWW/Library/Implementation/HTFile.c
--- 2.8.9dev.1/WWW/Library/Implementation/HTFile.c	Fri Feb 14 13:00:16 2014
+++ 2.8.9dev.2/WWW/Library/Implementation/HTFile.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.142 2014/02/13 18:30:01 tom Exp $
+ * $LynxId: HTFile.c,v 1.144 2014/12/08 01:38:05 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -212,7 +212,7 @@
 
 	HTSprintf0(bufp, fmt, entry);
     } else {
-	sprintf(fmt, "%" PRI_off_t, entry);
+	sprintf(fmt, "%" PRI_off_t, CAST_off_t (entry));
 
 	StrAllocCopy(*bufp, fmt);
     }
@@ -905,7 +905,7 @@
 	HTFormat result;
 
 	StrAllocCopy(newname, filename);
-	*(FindSearch(newname)) = '\0';
+	newname[((const char *) search) - filename] = '\0';
 	result = HTFileFormat(newname, pencoding, pdesc);
 	free(newname);
 	return result;
Index: WWW/Library/Implementation/HTFormat.c
--- 2.8.9dev.1/WWW/Library/Implementation/HTFormat.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/WWW/Library/Implementation/HTFormat.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.c,v 1.82 2013/11/28 11:12:32 tom Exp $
+ * $LynxId: HTFormat.c,v 1.83 2014/07/24 22:08:24 tom Exp $
  *
  *		Manage different file formats			HTFormat.c
  *		=============================
@@ -884,7 +884,7 @@
     if (anchor != 0) {
 	CTRACE((tfp, "HTCopy copied %"
 		PRI_off_t " actual, %"
-		PRI_off_t " limit\n", bytes, limit));
+		PRI_off_t " limit\n", CAST_off_t (bytes), CAST_off_t (limit)));
 	anchor->actual_length = bytes;
     }
 
Index: WWW/Library/Implementation/HTMIME.c
--- 2.8.9dev.1/WWW/Library/Implementation/HTMIME.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/WWW/Library/Implementation/HTMIME.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.88 2013/11/28 11:12:52 tom Exp $
+ * $LynxId: HTMIME.c,v 1.89 2014/07/24 22:08:24 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -580,8 +580,8 @@
     CTRACE((tfp, "...end of pumpData, copied %"
 	    PRI_off_t " vs %"
 	    PRI_off_t "\n",
-	    me->anchor->actual_length,
-	    me->anchor->content_length));
+	    CAST_off_t (me->anchor->actual_length),
+	    CAST_off_t (me->anchor->content_length)));
     me->anchor->actual_length = 0;
     return HT_OK;
 }
@@ -800,7 +800,7 @@
 	if (me->anchor->content_length < 0)
 	    me->anchor->content_length = 0;
 	CTRACE((tfp, "        Converted to integer: '%" PRI_off_t "'\n",
-		me->anchor->content_length));
+		CAST_off_t (me->anchor->content_length)));
 	break;
     case miCONTENT_LOCATION:
 	HTMIME_TrimDoubleQuotes(me->value);
Index: WWW/Library/Implementation/HTPlain.c
--- 2.8.9dev.1/WWW/Library/Implementation/HTPlain.c	Mon Jul 29 21:38:35 2013
+++ 2.8.9dev.2/WWW/Library/Implementation/HTPlain.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTPlain.c,v 1.51 2013/05/02 11:09:30 tom Exp $
+ * $LynxId: HTPlain.c,v 1.59 2014/12/08 01:11:15 tom Exp $
  *
  *		Plain text object		HTWrite.c
  *		=================
@@ -55,16 +55,8 @@
      */
     LYUCcharset *outUCI;
     int outUCLYhndl;
-    /*
-     * Counter, value, buffer and pointer for UTF-8 handling.  - FM
-     */
-    char utf_count;
-    UCode_t utf_char;
-    char utf_buf[8];
-    char *utf_buf_p;
-    /*
-     * The charset transformation structure.  - FM
-     */
+
+    UTFDecodeState U;
     UCTransParams T;
 };
 
@@ -193,11 +185,11 @@
 {
     const char *p;
     const char *e = s + l;
-    char c;
+    int c;
     unsigned c_unsign;
     BOOL chk;
     UCode_t code, uck = -1;
-    char saved_char_in = '\0';
+    int saved_char_in = '\0';
 
     for (p = s; p < e; p++) {
 #ifdef REMOVE_CR_ONLY
@@ -227,12 +219,6 @@
 		HTPlain_bs_pending = 2;
 		HTPlain_lastraw = UCH(*p);
 		continue;
-#if 0
-	    } else if (HTPlain_bs_pending != 2) {
-		HTPlain_bs_pending--;	/* 1 -> 0, 3 -> 2 */
-		HTPlain_lastraw = UCH(*p);
-		continue;
-#endif
 	    }
 	}
 
@@ -288,91 +274,23 @@
 	saved_char_in = '\0';
 	/*
 	 * Combine any UTF-8 multibytes into Unicode to check for special
-	 * characters.  - FM
+	 * characters. - FM, TD
 	 */
 	if (me->T.decode_utf8) {
-	    /*
-	     * Combine UTF-8 into Unicode.  Incomplete characters silently
-	     * ignored.  from Linux kernel's console.c - KW
-	     */
-	    if (TOASCII(c_unsign) > 127) {	/* S/390 -- gil -- 0371 */
-		/*
-		 * We have an octet from a multibyte character.  - FM
-		 */
-		if (me->utf_count > 0 && (c & 0xc0) == 0x80) {
-		    /*
-		     * Adjust the UCode_t value, add the octet to the buffer,
-		     * and decrement the byte count.  - FM
-		     */
-		    me->utf_char = (me->utf_char << 6) | (c & 0x3f);
-		    me->utf_count--;
-		    *(me->utf_buf_p) = c;
-		    (me->utf_buf_p)++;
-		    if (me->utf_count == 0) {
-			/*
-			 * Got a complete multibyte character.
-			 */
-			*(me->utf_buf_p) = '\0';
-			code = me->utf_char;
-			if (code > 0 && code < 256) {
-			    c = FROMASCII((char) code);
-			    c_unsign = UCH(c);
-			}
-		    } else {
-			/*
-			 * Get the next byte.  - FM
-			 */
-			continue;
-		    }
-		} else {
-		    /*
-		     * Start handling a new multibyte character.  - FM
-		     */
-		    me->utf_buf_p[0] = c;
-		    me->utf_buf_p = &me->utf_buf[1];
-		    if ((*p & 0xe0) == 0xc0) {
-			me->utf_count = 1;
-			me->utf_char = (c & 0x1f);
-		    } else if ((*p & 0xf0) == 0xe0) {
-			me->utf_count = 2;
-			me->utf_char = (c & 0x0f);
-		    } else if ((*p & 0xf8) == 0xf0) {
-			me->utf_count = 3;
-			me->utf_char = (c & 0x07);
-		    } else if ((*p & 0xfc) == 0xf8) {
-			me->utf_count = 4;
-			me->utf_char = (c & 0x03);
-		    } else if ((*p & 0xfe) == 0xfc) {
-			me->utf_count = 5;
-			me->utf_char = (c & 0x01);
-		    } else {
-			/*
-			 * We got garbage, so ignore it.  - FM
-			 */
-			me->utf_count = 0;
-			me->utf_buf_p[0] = '\0';
-			me->utf_buf_p = me->utf_buf;
-		    }
-		    /*
-		     * Get the next byte.  - FM
-		     */
-		    continue;
+	    switch (HTDecodeUTF8(&(me->U), &c, &code)) {
+	    case dUTF8_ok:
+		if (code < 256) {
+		    c = FROMASCII((char) code);
+		    c_unsign = UCH(c);
 		}
-	    } else if (me->utf_count > 0) {
-		/*
-		 * Got an ASCII character when expecting UTF-8 multibytes, so
-		 * ignore the buffered multibye characters and fall through
-		 * with the current ASCII character.  - FM
-		 */
-		me->utf_count = 0;
-		me->utf_buf[0] = '\0';
-		me->utf_buf_p = me->utf_buf;
-		code = (UCode_t) c_unsign;
-	    } else {
-		/*
-		 * Got a valid ASCII character, so fall through with it.  - FM
-		 */
-		code = (UCode_t) c_unsign;
+		break;
+	    case dUTF8_err:
+		code = UCS_REPL;
+		strcpy(me->U.utf_buf, "\357\277\275");
+		me->U.utf_buf_p = (me->U.utf_buf + 3);
+		break;
+	    case dUTF8_more:
+		continue;
 	    }
 	}
 	/*
@@ -381,10 +299,6 @@
 	 */
 	if (!(me->T.decode_utf8 &&
 	      UCH(*p) > 127)) {
-#ifdef NOTDEFINED
-	    if (me->T.strip_raw_char_in)
-		saved_char_in = c;
-#endif /* NOTDEFINED */
 	    if (me->T.trans_to_uni &&
 		(TOASCII(code) >= LYlowest_eightbit[me->inUCLYhndl] ||	/* S/390 -- gil -- 0389 */
 		 (code < ' ' && code != 0 &&
@@ -430,7 +344,7 @@
 		    if (uck == 0) {
 			continue;
 		    } else if (uck < 0) {
-			me->utf_buf[0] = '\0';
+			me->U.utf_buf[0] = '\0';
 		    } else {
 			c = replace_buf[0];
 			if (c && replace_buf[1]) {
@@ -438,11 +352,11 @@
 			    continue;
 			}
 		    }
-		    me->utf_buf[0] = '\0';
+		    me->U.utf_buf[0] = '\0';
 		    code = UCH(c);
 		}		/*  Next line end of ugly stuff for C0. - KW */
 	    } else {
-		me->utf_buf[0] = '\0';
+		me->U.utf_buf[0] = '\0';
 		code = UCH(c);
 	    }
 	}
@@ -498,7 +412,7 @@
 	    /*
 	     * If we get to here, pass the displayable ASCII characters.  - FM
 	     */
-	} else if ((code >= ' ' && TOASCII(code) < 127) ||
+	} else if ((code >= ' ' && code != UCS_REPL && TOASCII(code) < 127) ||
 		   (PASSHI8BIT &&
 		    c >= LYlowest_eightbit[me->outUCLYhndl]) ||
 		   *p == '\n' || *p == '\t') {
@@ -545,10 +459,10 @@
 	    /*
 	     * We want UTF-8 output, so do it now.  - FM
 	     */
-	    if (*me->utf_buf) {
-		HText_appendText(me->text, me->utf_buf);
-		me->utf_buf[0] = '\0';
-		me->utf_buf_p = me->utf_buf;
+	    if (*me->U.utf_buf) {
+		HText_appendText(me->text, me->U.utf_buf);
+		me->U.utf_buf[0] = '\0';
+		me->U.utf_buf_p = me->U.utf_buf;
 	    } else if (UCConvertUniToUtf8(code, replace_buf)) {
 		HText_appendText(me->text, replace_buf);
 	    } else {
@@ -559,15 +473,6 @@
 		sprintf(replace_buf, "U%.2lX", (unsigned long) TOASCII(code));
 		HText_appendText(me->text, replace_buf);
 	    }
-#ifdef NOTDEFINED
-	} else if (me->T.strip_raw_char_in &&
-		   UCH(*p) >= 192 &&
-		   UCH(*p) < 255) {
-	    /*
-	     * KOI special:  strip high bit, gives (somewhat) readable ASCII.
-	     */
-	    HText_appendCharacter(me->text, (char) (*p & 0x7f));
-#endif /* NOTDEFINED */
 	    /*
 	     * If we don't actually want the character, make it safe and output
 	     * that now.  - FM
@@ -678,10 +583,10 @@
 
     HTPlain_lastraw = -1;
 
-    me->utf_count = 0;
-    me->utf_char = 0;
-    me->utf_buf[0] = me->utf_buf[6] = me->utf_buf[7] = '\0';
-    me->utf_buf_p = me->utf_buf;
+    me->U.utf_count = 0;
+    me->U.utf_char = 0;
+    me->U.utf_buf[0] = me->U.utf_buf[6] = me->U.utf_buf[7] = '\0';
+    me->U.utf_buf_p = me->U.utf_buf;
     me->outUCLYhndl = HTAnchor_getUCLYhndl(anchor, UCT_STAGE_HTEXT);
     me->inUCLYhndl = HTAnchor_getUCLYhndl(anchor, UCT_STAGE_PARSER);
     HTPlain_getChartransInfo(me, anchor);
Index: WWW/Library/Implementation/HTTCP.c
--- 2.8.9dev.1/WWW/Library/Implementation/HTTCP.c	Wed Dec 18 01:56:13 2013
+++ 2.8.9dev.2/WWW/Library/Implementation/HTTCP.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.129 2013/12/07 15:36:55 tom Exp $
+ * $LynxId: HTTCP.c,v 1.134 2014/12/03 01:00:40 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -19,6 +19,9 @@
  *	16 Jul 95  S. Bjorndahl added kluge to deal with LIBCMU bug
  */
 
+#define LYNX_ADDRINFO	struct addrinfo
+#define LYNX_HOSTENT	struct hostent
+
 #include <HTUtils.h>
 #include <HTParse.h>
 #include <HTAlert.h>
@@ -39,9 +42,6 @@
 #include <netdb.h>
 #endif /* __DJGPP__ */
 
-#define LYNX_ADDRINFO	struct addrinfo
-#define LYNX_HOSTENT	struct hostent
-
 #define OK_HOST(p) ((p) != 0 && ((p)->h_length) != 0)
 
 #ifdef SVR4_BSDSELECT
@@ -380,7 +380,7 @@
  *  addresses, in a format inspired by gdb's print format. - kw
  */
 static void dump_hostent(const char *msgprefix,
-			 void *data)
+			 const void *data)
 {
     if (TRACE) {
 	int i;
@@ -537,6 +537,8 @@
 static size_t fill_rehostent(void **rehostent,
 			     const LYNX_HOSTENT *phost)
 {
+    static const char *this_func = "fill_rehostent";
+
     LYNX_HOSTENT *data = 0;
     int num_addrs = 0;
     int num_aliases = 0;
@@ -570,7 +572,7 @@
     }
 
     if ((result = calloc(need, sizeof(char))) == 0)
-	  outofmem(__FILE__, "fill_rehostent");
+	  outofmem(__FILE__, this_func);
 
     *rehostent = result;
 
@@ -671,13 +673,18 @@
 #endif
 #endif
 
-static BOOL setup_nsl_fork(void (*really) (char *, char *, STATUSES *, void **),
+static BOOL setup_nsl_fork(void (*really) (const char *,
+					   const char *,
+					   STATUSES *,
+					   void **),
 			   unsigned (*readit) (int, char *, size_t),
-			   void (*dumpit) (const char *, void *),
-			   char *host,
-			   char *port,
+			   void (*dumpit) (const char *, const void *),
+			   const char *host,
+			   const char *port,
 			   void **rehostent)
 {
+    static const char *this_func = "setup_nsl_fork";
+
     STATUSES statuses;
 
     /*
@@ -933,7 +940,7 @@
 		     * Then get the full reorganized hostent.  -BL, kw
 		     */
 		    if ((*rehostent = malloc(statuses.rehostentlen)) == 0)
-			outofmem(__FILE__, "setup_nsl_fork");
+			outofmem(__FILE__, this_func);
 		    readret = (*readit) (pfd[0], *rehostent, statuses.rehostentlen);
 #ifdef DEBUG_HOSTENT
 		    dumpit("Read from pipe", *rehostent);
@@ -984,7 +991,7 @@
 	 * Abort if interrupt key pressed.
 	 */
 	if (HTCheckForInterrupt()) {
-	    CTRACE((tfp, "LYGetHostByName: INTERRUPTED gethostbyname.\n"));
+	    CTRACE((tfp, "%s: INTERRUPTED gethostbyname.\n", this_func));
 	    kill(fpid, SIGTERM);
 	    waitpid(fpid, NULL, WNOHANG);
 	    close(pfd[0]);
@@ -1000,23 +1007,23 @@
     if (waitret > 0) {
 	if (WIFEXITED(waitstat)) {
 	    CTRACE((tfp,
-		    "LYGetHostByName: NSL_FORK child %d exited, status 0x%x.\n",
-		    (int) waitret, WEXITSTATUS(waitstat)));
+		    "%s: NSL_FORK child %d exited, status 0x%x.\n",
+		    this_func, (int) waitret, WEXITSTATUS(waitstat)));
 	} else if (WIFSIGNALED(waitstat)) {
 	    CTRACE((tfp,
-		    "LYGetHostByName: NSL_FORK child %d got signal, status 0x%x!\n",
-		    (int) waitret, WTERMSIG(waitstat)));
+		    "%s: NSL_FORK child %d got signal, status 0x%x!\n",
+		    this_func, (int) waitret, WTERMSIG(waitstat)));
 #ifdef WCOREDUMP
 	    if (WCOREDUMP(waitstat)) {
 		CTRACE((tfp,
-			"LYGetHostByName: NSL_FORK child %d dumped core!\n",
-			(int) waitret));
+			"%s: NSL_FORK child %d dumped core!\n",
+			this_func, (int) waitret));
 	    }
 #endif /* WCOREDUMP */
 	} else if (WIFSTOPPED(waitstat)) {
 	    CTRACE((tfp,
-		    "LYGetHostByName: NSL_FORK child %d is stopped, status 0x%x!\n",
-		    (int) waitret, WSTOPSIG(waitstat)));
+		    "%s: NSL_FORK child %d is stopped, status 0x%x!\n",
+		    this_func, (int) waitret, WSTOPSIG(waitstat)));
 	}
     }
     if (!got_rehostent) {
@@ -1030,8 +1037,8 @@
 /*
  * This is called via the child-side of the fork.
  */
-static void really_gethostbyname(char *host,
-				 char *port GCC_UNUSED,
+static void really_gethostbyname(const char *host,
+				 const char *port GCC_UNUSED,
 				 STATUSES * statuses,
 				 void **rehostent)
 {
@@ -1110,6 +1117,7 @@
  */
 LYNX_HOSTENT *LYGetHostByName(char *host)
 {
+    static const char *this_func = "LYGetHostByName";
 
 #ifdef NSL_FORK
     /* for transfer of result between from child to parent: */
@@ -1123,15 +1131,15 @@
 #endif
 
     if (!host) {
-	CTRACE((tfp, "LYGetHostByName: Can't parse `NULL'.\n"));
+	CTRACE((tfp, "%s: Can't parse `NULL'.\n", this_func));
 	lynx_nsl_status = HT_INTERNAL;
 	return NULL;
     }
-    CTRACE((tfp, "LYGetHostByName: parsing `%s'.\n", host));
+    CTRACE((tfp, "%s: parsing `%s'.\n", this_func, host));
 
     /*  Could disable this if all our callers already check - kw */
     if (HTCheckForInterrupt()) {
-	CTRACE((tfp, "LYGetHostByName: INTERRUPTED for '%s'.\n", host));
+	CTRACE((tfp, "%s: INTERRUPTED for '%s'.\n", this_func, host));
 	lynx_nsl_status = HT_INTERRUPTED;
 	return NULL;
     }
@@ -1148,7 +1156,7 @@
 	return NULL;
     }
 #ifdef MVS			/* Outstanding problem with crash in MVS gethostbyname */
-    CTRACE((tfp, "LYGetHostByName: Calling gethostbyname(%s)\n", host));
+    CTRACE((tfp, "%s: Calling gethostbyname(%s)\n", this_func, host));
 #endif /* MVS */
 
     CTRACE_FLUSH(tfp);		/* so child messages will not mess up parent log */
@@ -1226,7 +1234,7 @@
 
 	phost = gethostbyname(host);	/* See netdb.h */
 #ifdef MVS
-	CTRACE((tfp, "LYGetHostByName: gethostbyname() returned %d\n", phost));
+	CTRACE((tfp, "%s: gethostbyname() returned %d\n", this_func, phost));
 #endif /* MVS */
 	if (phost) {
 	    lynx_nsl_status = HT_OK;
@@ -1240,15 +1248,14 @@
 #endif /* !NSL_FORK */
 
 #ifdef DEBUG_HOSTENT
-    dump_hostent("LYGetHostByName", result_phost);
-    CTRACE((tfp, "LYGetHostByName: Resolved name to a hostent.\n"));
+    dump_hostent(this_func, result_phost);
+    CTRACE((tfp, "%s: Resolved name to a hostent.\n", this_func));
 #endif
 
     return result_phost;	/* OK */
 
   failed:
-    CTRACE((tfp, "LYGetHostByName: Can't find internet node name `%s'.\n",
-	    host));
+    CTRACE((tfp, "%s: Can't find internet node name `%s'.\n", this_func, host));
     return NULL;
 }
 
@@ -1267,18 +1274,20 @@
 #ifndef INET6
 static int HTParseInet(SockA * soc_in, const char *str)
 {
+    static const char *this_func = "HTParseInet";
+
     char *port;
     int dotcount_ip = 0;	/* for dotted decimal IP addr */
     char *strptr;
     char *host = NULL;
 
     if (!str) {
-	CTRACE((tfp, "HTParseInet: Can't parse `NULL'.\n"));
+	CTRACE((tfp, "%s: Can't parse `NULL'.\n", this_func));
 	return -1;
     }
-    CTRACE((tfp, "HTParseInet: parsing `%s'.\n", str));
+    CTRACE((tfp, "%s: parsing `%s'.\n", this_func, str));
     if (HTCheckForInterrupt()) {
-	CTRACE((tfp, "HTParseInet: INTERRUPTED for '%s'.\n", str));
+	CTRACE((tfp, "%s: INTERRUPTED for '%s'.\n", this_func, str));
 	return -1;
     }
     StrAllocCopy(host, str);	/* Make a copy we can mutilate */
@@ -1368,7 +1377,7 @@
     } else {			/* Alphanumeric node name: */
 
 #ifdef MVS			/* Outstanding problem with crash in MVS gethostbyname */
-	CTRACE((tfp, "HTParseInet: Calling LYGetHostByName(%s)\n", host));
+	CTRACE((tfp, "%s: Calling LYGetHostByName(%s)\n", this_func, host));
 #endif /* MVS */
 
 #ifdef _WINDOWS_NSL
@@ -1395,7 +1404,8 @@
     }				/* Alphanumeric node name */
 
     CTRACE((tfp,
-	    "HTParseInet: Parsed address as port %d, IP address %d.%d.%d.%d\n",
+	    "%s: Parsed address as port %d, IP address %d.%d.%d.%d\n",
+	    this_func,
 	    (int) ntohs(soc_in->sin_port),
 	    (int) *((unsigned char *) (&soc_in->sin_addr) + 0),
 	    (int) *((unsigned char *) (&soc_in->sin_addr) + 1),
@@ -1406,8 +1416,8 @@
     return 0;			/* OK */
 
   failed:
-    CTRACE((tfp, "HTParseInet: Can't find internet node name `%s'.\n",
-	    host));
+    CTRACE((tfp, "%s: Can't find internet node name `%s'.\n",
+	    this_func, host));
     FREE(host);
     switch (lynx_nsl_status) {
     case HT_NOT_ACCEPTABLE:
@@ -1421,13 +1431,13 @@
 
 #ifdef INET6
 
-static void dump_addrinfo(const char *tag, void *data)
+static void dump_addrinfo(const char *tag, const void *data)
 {
-    LYNX_ADDRINFO *res;
+    const LYNX_ADDRINFO *res;
     int count = 0;
 
     CTRACE((tfp, "dump_addrinfo %s:\n", tag));
-    for (res = (LYNX_ADDRINFO *) data; res; res = res->ai_next) {
+    for (res = (const LYNX_ADDRINFO *) data; res; res = res->ai_next) {
 	char hostbuf[1024], portbuf[1024];
 
 	++count;
@@ -1457,6 +1467,8 @@
 static size_t fill_addrinfo(void **buffer,
 			    const LYNX_ADDRINFO *phost)
 {
+    static const char *this_func = "fill_addinfo";
+
     const LYNX_ADDRINFO *q;
     LYNX_ADDRINFO *actual;
     LYNX_ADDRINFO *result;
@@ -1474,7 +1486,7 @@
     CTRACE((tfp, "...fill_addrinfo %d:%lu\n", limit, (unsigned long) need));
 
     if ((result = (LYNX_ADDRINFO *) calloc(1, need)) == 0)
-	outofmem(__FILE__, "fill_addrinfo");
+	outofmem(__FILE__, this_func);
 
     *buffer = actual = result;
     heap = ((char *) actual) + ((size_t) limit * sizeof(LYNX_ADDRINFO));
@@ -1545,8 +1557,8 @@
 /*
  * This is called via the child-side of the fork.
  */
-static void really_getaddrinfo(char *host,
-			       char *port,
+static void really_getaddrinfo(const char *host,
+			       const char *port,
 			       STATUSES * statuses,
 			       void **result)
 {
@@ -1572,7 +1584,7 @@
 #endif
 	statuses->rehostentlen = fill_addrinfo(result, res);
 #ifdef DEBUG_HOSTENT_CHILD
-	dump_addrinfo("CHILD fill_addrinfo", (LYNX_ADDRINFO *) (*result));
+	dump_addrinfo("CHILD fill_addrinfo", (const LYNX_ADDRINFO *) (*result));
 #endif
 	if (statuses->rehostentlen <= sizeof(LYNX_ADDRINFO)) {
 	    statuses->rehostentlen = 0;
@@ -1584,8 +1596,8 @@
 }
 #endif /* NSL_FORK */
 
-static LYNX_ADDRINFO *HTGetAddrInfo(const char *str,
-				    const int defport)
+LYNX_ADDRINFO *HTGetAddrInfo(const char *str,
+			     const int defport)
 {
 #ifdef NSL_FORK
     /* for transfer of result between from child to parent: */
Index: WWW/Library/Implementation/HTTCP.h
--- 2.8.9dev.1/WWW/Library/Implementation/HTTCP.h	Sun Jan  2 23:35:21 2005
+++ 2.8.9dev.2/WWW/Library/Implementation/HTTCP.h	Mon Dec 22 01:39:40 2014
@@ -1,8 +1,10 @@
-/*                               /Net/dxcern/userd/timbl/hypertext/WWW/Library/src/HTTCP.html
-                               GENERIC TCP/IP COMMUNICATION
-
-   This module has the common code for handling TCP/IP connections etc.
-
+/*
+ * $LynxId: HTTCP.h,v 1.24 2014/12/03 00:27:57 tom Exp $
+ *
+ *                               /Net/dxcern/userd/timbl/hypertext/WWW/Library/src/HTTCP.html
+ *                             GENERIC TCP/IP COMMUNICATION
+ *
+ * This module has the common code for handling TCP/IP connections etc.
  */
 #ifndef HTTCP_H
 #define HTTCP_H
@@ -86,7 +88,18 @@
  */
     extern int lynx_nsl_status;
 
-    extern struct hostent *LYGetHostByName(char *str);
+#ifndef LYNX_HOSTENT
+#define LYNX_HOSTENT void
+#endif
+
+    extern LYNX_HOSTENT *LYGetHostByName(char *host);
+
+#ifdef INET6
+#ifndef LYNX_ADDRINFO
+#define LYNX_ADDRINFO void
+#endif
+    extern LYNX_ADDRINFO *HTGetAddrInfo(const char *str, const int defport);
+#endif
 
 /*      Get Name of This Machine
  *      ------------------------
Index: WWW/Library/Implementation/HTTP.c
--- 2.8.9dev.1/WWW/Library/Implementation/HTTP.c	Sat Jan 11 19:06:15 2014
+++ 2.8.9dev.2/WWW/Library/Implementation/HTTP.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.135 2014/01/11 16:52:29 tom Exp $
+ * $LynxId: HTTP.c,v 1.136 2014/11/30 22:51:30 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -119,7 +119,11 @@
 #else
 	SSLeay_add_ssl_algorithms();
 	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+#ifdef SSL_OP_NO_SSLv2
 	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
+#else
+	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
+#endif
 #ifdef SSL_OP_NO_COMPRESSION
 	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
 #endif
Index: WWW/Library/Implementation/SGML.c
--- 2.8.9dev.1/WWW/Library/Implementation/SGML.c	Mon Feb 13 02:46:17 2012
+++ 2.8.9dev.2/WWW/Library/Implementation/SGML.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.148 2012/02/10 18:32:26 tom Exp $
+ * $LynxId: SGML.c,v 1.155 2014/12/10 09:48:35 tom Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -41,9 +41,9 @@
 # include <LYPrettySrc.h>
 #endif
 
-#define AssumeCP1252(context) \
-	(((context)->inUCLYhndl == LATIN1 \
-	  || (context)->inUCLYhndl == US_ASCII) \
+#define AssumeCP1252(me) \
+	(((me)->inUCLYhndl == LATIN1 \
+	  || (me)->inUCLYhndl == US_ASCII) \
 	 && html5_charsets)
 
 #define INVALID (-1)
@@ -86,10 +86,10 @@
 	orig_HTChunkPutUtf8Char(ch,x); \
     }
 
-#define PUTS(str) ((*context->actions->put_string)(context->target, str))
-#define PUTC(ch)  ((*context->actions->put_character)(context->target, (char) ch))
-#define PUTUTF8(code) (UCPutUtf8_charstring((HTStream *)context->target, \
-		      (putc_func_t*)(context->actions->put_character), code))
+#define PUTS(str) ((*me->actions->put_string)(me->target, str))
+#define PUTC(ch)  ((*me->actions->put_character)(me->target, (char) ch))
+#define PUTUTF8(code) (UCPutUtf8_charstring((HTStream *)me->target, \
+		      (putc_func_t*)(me->actions->put_character), code))
 
 #ifdef USE_PRETTYSRC
 #define PRETTYSRC_PUTC(c) if (psrc_view) PUTC(c)
@@ -215,10 +215,7 @@
     int inUCLYhndl;		/* charset we are fed       */
     LYUCcharset *outUCI;	/* anchor UCInfo for target */
     int outUCLYhndl;		/* charset for target       */
-    char utf_count;
-    UCode_t utf_char;
-    char utf_buf[8];
-    char *utf_buf_p;
+    UTFDecodeState U;
     UCTransParams T;
     int current_tag_charset;	/* charset to pass attributes */
 
@@ -317,7 +314,7 @@
 
 #ifdef USE_PRETTYSRC
 
-static void HTMLSRC_apply_markup(HTStream *context,
+static void HTMLSRC_apply_markup(HTStream *me,
 				 HTlexeme lexeme,
 				 int start)
 {
@@ -334,28 +331,28 @@
 #endif
 	CTRACE((tfp, ts->start ? "SRCSTART %d\n" : "SRCSTOP %d\n", (int) lexeme));
 	if (ts->start)
-	    (*context->actions->start_element) (context->target,
-						(int) ts->element,
-						ts->present,
-						(STRING2PTR) ts->value,
-						context->current_tag_charset,
-						&context->include);
+	    (*me->actions->start_element) (me->target,
+					   (int) ts->element,
+					   ts->present,
+					   (STRING2PTR) ts->value,
+					   me->current_tag_charset,
+					   &me->include);
 	else
-	    (*context->actions->end_element) (context->target,
-					      (int) ts->element,
-					      &context->include);
+	    (*me->actions->end_element) (me->target,
+					 (int) ts->element,
+					 &me->include);
 	ts = ts->next;
     }
 }
 
-#define PSRCSTART(x)	HTMLSRC_apply_markup(context,HTL_##x,START)
-#define PSRCSTOP(x)   HTMLSRC_apply_markup(context,HTL_##x,STOP)
+#define PSRCSTART(x)	HTMLSRC_apply_markup(me,HTL_##x,START)
+#define PSRCSTOP(x)   HTMLSRC_apply_markup(me,HTL_##x,STOP)
 
-#define attr_is_href context->cur_attr_is_href
-#define attr_is_name context->cur_attr_is_name
+#define attr_is_href me->cur_attr_is_href
+#define attr_is_name me->cur_attr_is_name
 #endif
 
-static void set_chartrans_handling(HTStream *context,
+static void set_chartrans_handling(HTStream *me,
 				   HTParentAnchor *anchor,
 				   int chndl)
 {
@@ -390,17 +387,17 @@
 	/*
 	 * Get the chartrans info for output to the HTML parser.  - FM
 	 */
-	context->outUCI = HTAnchor_getUCInfoStage(anchor,
-						  UCT_STAGE_STRUCTURED);
-	context->outUCLYhndl = HTAnchor_getUCLYhndl(context->node_anchor,
-						    UCT_STAGE_STRUCTURED);
+	me->outUCI = HTAnchor_getUCInfoStage(anchor,
+					     UCT_STAGE_STRUCTURED);
+	me->outUCLYhndl = HTAnchor_getUCLYhndl(me->node_anchor,
+					       UCT_STAGE_STRUCTURED);
     }
     /*
      * Set the in->out transformation parameters.  - FM
      */
-    UCSetTransParams(&context->T,
-		     context->inUCLYhndl, context->inUCI,
-		     context->outUCLYhndl, context->outUCI);
+    UCSetTransParams(&me->T,
+		     me->inUCLYhndl, me->inUCI,
+		     me->outUCLYhndl, me->outUCI);
     /*
      * This is intended for passing the SGML parser's input charset as an
      * argument in each call to the HTML parser's start tag function, but it
@@ -409,48 +406,48 @@
      */
 #ifndef EXP_JAPANESEUTF8_SUPPORT
     if (IS_CJK_TTY) {
-	context->current_tag_charset = -1;
+	me->current_tag_charset = -1;
     } else
 #endif
-    if (context->T.transp) {
-	context->current_tag_charset = context->inUCLYhndl;
-    } else if (context->T.decode_utf8) {
-	context->current_tag_charset = context->inUCLYhndl;
-    } else if (context->T.do_8bitraw ||
-	       context->T.use_raw_char_in) {
-	context->current_tag_charset = context->inUCLYhndl;
-    } else if (context->T.output_utf8 ||
-	       context->T.trans_from_uni) {
-	context->current_tag_charset = UCGetLYhndl_byMIME("utf-8");
+    if (me->T.transp) {
+	me->current_tag_charset = me->inUCLYhndl;
+    } else if (me->T.decode_utf8) {
+	me->current_tag_charset = me->inUCLYhndl;
+    } else if (me->T.do_8bitraw ||
+	       me->T.use_raw_char_in) {
+	me->current_tag_charset = me->inUCLYhndl;
+    } else if (me->T.output_utf8 ||
+	       me->T.trans_from_uni) {
+	me->current_tag_charset = UCGetLYhndl_byMIME("utf-8");
     } else {
-	context->current_tag_charset = LATIN1;
+	me->current_tag_charset = LATIN1;
     }
 }
 
-static void change_chartrans_handling(HTStream *context)
+static void change_chartrans_handling(HTStream *me)
 {
-    int new_LYhndl = HTAnchor_getUCLYhndl(context->node_anchor,
+    int new_LYhndl = HTAnchor_getUCLYhndl(me->node_anchor,
 					  UCT_STAGE_PARSER);
 
-    if (new_LYhndl != context->inUCLYhndl &&
+    if (new_LYhndl != me->inUCLYhndl &&
 	new_LYhndl >= 0) {
 	/*
 	 * Something changed.  but ignore if a META wants an unknown charset.
 	 */
-	LYUCcharset *new_UCI = HTAnchor_getUCInfoStage(context->node_anchor,
+	LYUCcharset *new_UCI = HTAnchor_getUCInfoStage(me->node_anchor,
 						       UCT_STAGE_PARSER);
 
 	if (new_UCI) {
-	    LYUCcharset *next_UCI = HTAnchor_getUCInfoStage(context->node_anchor,
+	    LYUCcharset *next_UCI = HTAnchor_getUCInfoStage(me->node_anchor,
 							    UCT_STAGE_STRUCTURED);
-	    int next_LYhndl = HTAnchor_getUCLYhndl(context->node_anchor, UCT_STAGE_STRUCTURED);
+	    int next_LYhndl = HTAnchor_getUCLYhndl(me->node_anchor, UCT_STAGE_STRUCTURED);
 
-	    context->inUCI = new_UCI;
-	    context->inUCLYhndl = new_LYhndl;
-	    context->outUCI = next_UCI;
-	    context->outUCLYhndl = next_LYhndl;
-	    set_chartrans_handling(context,
-				   context->node_anchor, next_LYhndl);
+	    me->inUCI = new_UCI;
+	    me->inUCLYhndl = new_LYhndl;
+	    me->outUCI = next_UCI;
+	    me->outUCLYhndl = next_LYhndl;
+	    set_chartrans_handling(me,
+				   me->node_anchor, next_LYhndl);
 	}
     }
 }
@@ -465,9 +462,9 @@
  */
 /* PUBLIC const char * SGML_default = "";   ?? */
 
-static void handle_attribute_name(HTStream *context, const char *s)
+static void handle_attribute_name(HTStream *me, const char *s)
 {
-    HTTag *tag = context->current_tag;
+    HTTag *tag = me->current_tag;
     const attr *attributes = tag->attributes;
     int high, low, i, diff;
 
@@ -480,10 +477,10 @@
     /*
      * Ignore unknown tag.  - KW
      */
-    if (tag == context->unknown_tag) {
+    if (tag == me->unknown_tag) {
 #ifdef USE_PRETTYSRC
 	if (psrc_view)
-	    context->current_attribute_number = 1;	/* anything !=INVALID */
+	    me->current_attribute_number = 1;	/* anything !=INVALID */
 #endif
 	return;
     }
@@ -497,7 +494,7 @@
 	i = (low + (high - low) / 2);
 	diff = my_casecomp(attributes[i].name, s);
 	if (diff == 0) {	/* success: found it */
-	    context->current_attribute_number = i;
+	    me->current_attribute_number = i;
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
 		attr_is_name = (BOOL) (attributes[i].type == HTMLA_ANAME);
@@ -505,8 +502,8 @@
 	    } else
 #endif
 	    {
-		context->present[i] = YES;
-		Clear_extra(context->value[i]);
+		me->present[i] = YES;
+		Clear_extra(me->value[i]);
 #ifdef USE_COLOR_STYLE
 #   ifdef USE_PRETTYSRC
 		current_is_class = IS_C(attributes[i]);
@@ -522,17 +519,17 @@
     }				/* for */
 
     CTRACE((tfp, "SGML: Unknown attribute %s for tag %s\n",
-	    s, NonNull(context->current_tag->name)));
-    context->current_attribute_number = INVALID;	/* Invalid */
+	    s, NonNull(me->current_tag->name)));
+    me->current_attribute_number = INVALID;	/* Invalid */
 }
 
 /*	Handle attribute value
  *	----------------------
  */
-static void handle_attribute_value(HTStream *context, const char *s)
+static void handle_attribute_value(HTStream *me, const char *s)
 {
-    if (context->current_attribute_number != INVALID) {
-	StrAllocCopy_extra(context->value[context->current_attribute_number], s);
+    if (me->current_attribute_number != INVALID) {
+	StrAllocCopy_extra(me->value[me->current_attribute_number], s);
 #ifdef USE_COLOR_STYLE
 	if (current_is_class) {
 	    StrNCpy(class_string, s, TEMPSTRINGSIZE);
@@ -544,7 +541,7 @@
     } else {
 	CTRACE((tfp, "SGML: Attribute value %s ***ignored\n", s));
     }
-    context->current_attribute_number = INVALID;	/* can't have two assignments! */
+    me->current_attribute_number = INVALID;	/* can't have two assignments! */
 }
 
 /*
@@ -557,10 +554,10 @@
  *  but also in UCdomap.c because they are non printable...
  *
  */
-static BOOL put_special_unicodes(HTStream *context, UCode_t code)
+static BOOL put_special_unicodes(HTStream *me, UCode_t code)
 {
     /* (Tgf_nolyspcl) */
-    if (context->no_lynx_specialcodes) {
+    if (me->no_lynx_specialcodes) {
 	/*
 	 * We were asked by a "DTD" flag to not generate lynx specials.  - kw
 	 */
@@ -626,7 +623,7 @@
 }
 
 #ifdef USE_PRETTYSRC
-static void put_pretty_entity(HTStream *context, int term)
+static void put_pretty_entity(HTStream *me, int term)
 {
     PSRCSTART(entity);
     PUTC('&');
@@ -636,10 +633,10 @@
     PSRCSTOP(entity);
 }
 
-static void put_pretty_number(HTStream *context)
+static void put_pretty_number(HTStream *me)
 {
     PSRCSTART(entity);
-    PUTS((context->isHex ? "&#x" : "&#"));
+    PUTS((me->isHex ? "&#x" : "&#"));
     PUTS(entity_string);
     PUTC(';');
     PSRCSTOP(entity);
@@ -663,11 +660,11 @@
 static char replace_buf[64];	/* buffer for replacement strings */
 static BOOL FoundEntity = FALSE;
 
-static void handle_entity(HTStream *context, int term)
+static void handle_entity(HTStream *me, int term)
 {
     UCode_t code;
     long uck = -1;
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     /*
      * Handle all entities normally.  - FM
@@ -678,10 +675,10 @@
 	 * We got a Unicode value for the entity name.  Check for special
 	 * Unicodes.  - FM
 	 */
-	if (put_special_unicodes(context, code)) {
+	if (put_special_unicodes(me, code)) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		put_pretty_entity(context, term);
+		put_pretty_entity(me, term);
 	    }
 #endif
 	    FoundEntity = TRUE;
@@ -690,30 +687,30 @@
 	/*
 	 * Seek a translation from the chartrans tables.
 	 */
-	if ((uck = UCTransUniChar(code, context->outUCLYhndl)) >= 32 &&
+	if ((uck = UCTransUniChar(code, me->outUCLYhndl)) >= 32 &&
 /* =============== work in ASCII below here ===============  S/390 -- gil -- 0672 */
 	    uck < 256 &&
 	    (uck < 127 ||
-	     uck >= LYlowest_eightbit[context->outUCLYhndl])) {
+	     uck >= LYlowest_eightbit[me->outUCLYhndl])) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		put_pretty_entity(context, term);
+		put_pretty_entity(me, term);
 	    } else
 #endif
 		PUTC(FROMASCII((char) uck));
 	    FoundEntity = TRUE;
 	    return;
 	} else if ((uck == -4 ||
-		    (context->T.repl_translated_C0 &&
+		    (me->T.repl_translated_C0 &&
 		     uck > 0 && uck < 32)) &&
 	    /*
 	     * Not found; look for replacement string.
 	     */
 		   (uck = UCTransUniCharStr(replace_buf, 60, code,
-					    context->outUCLYhndl, 0) >= 0)) {
+					    me->outUCLYhndl, 0) >= 0)) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		put_pretty_entity(context, term);
+		put_pretty_entity(me, term);
 	    } else
 #endif
 		PUTS(replace_buf);
@@ -724,19 +721,19 @@
 	 * If we're displaying UTF-8, try that now.  - FM
 	 */
 #ifndef USE_PRETTYSRC
-	if (context->T.output_utf8 && PUTUTF8(code)) {
+	if (me->T.output_utf8 && PUTUTF8(code)) {
 	    FoundEntity = TRUE;
 	    return;
 	}
 #else
-	if (context->T.output_utf8 && (psrc_view
-				       ? (UCPutUtf8_charstring((HTStream *) context->target,
-							       (putc_func_t *) (fake_put_character),
-							       code))
-				       : PUTUTF8(code))) {
+	if (me->T.output_utf8 && (psrc_view
+				  ? (UCPutUtf8_charstring((HTStream *) me->target,
+							  (putc_func_t *) (fake_put_character),
+							  code))
+				  : PUTUTF8(code))) {
 
 	    if (psrc_view) {
-		put_pretty_entity(context, term);
+		put_pretty_entity(me, term);
 	    }
 
 	    FoundEntity = TRUE;
@@ -749,7 +746,7 @@
 	if (code >= 32 && code < 127) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		put_pretty_entity(context, term);
+		put_pretty_entity(me, term);
 	    } else
 #endif
 
@@ -767,7 +764,7 @@
 	    CTRACE((tfp, "handle_entity: Ignoring '%s'.\n", s));
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		put_pretty_entity(context, term);
+		put_pretty_entity(me, term);
 	    }
 #endif
 	    FoundEntity = TRUE;
@@ -781,7 +778,7 @@
 	    CTRACE((tfp, "handle_entity: Ignoring '%s'.\n", s));
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		put_pretty_entity(context, term);
+		put_pretty_entity(me, term);
 	    }
 #endif
 	    FoundEntity = TRUE;
@@ -810,18 +807,18 @@
 /*	Handle comment
  *	--------------
  */
-static void handle_comment(HTStream *context)
+static void handle_comment(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Comment:\n<%s>\n", s));
 
-    if (context->csi == NULL &&
+    if (me->csi == NULL &&
 	StrNCmp(s, "!--#", 4) == 0 &&
-	LYCheckForCSI(context->node_anchor, &context->url) == TRUE) {
-	LYDoCSI(context->url, s, &context->csi);
+	LYCheckForCSI(me->node_anchor, &me->url) == TRUE) {
+	LYDoCSI(me->url, s, &me->csi);
     } else {
-	LYCommentHacks(context->node_anchor, context->string->data);
+	LYCommentHacks(me->node_anchor, me->string->data);
     }
 
     return;
@@ -830,9 +827,9 @@
 /*	Handle identifier
  *	-----------------
  */
-static void handle_identifier(HTStream *context)
+static void handle_identifier(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Identifier:\n<%s>\n", s));
 
@@ -842,14 +839,14 @@
 /*	Handle doctype
  *	--------------
  */
-static void handle_doctype(HTStream *context)
+static void handle_doctype(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Doctype:\n<%s>\n", s));
     if (strstr(s, "DTD XHTML ") != 0) {
 	CTRACE((tfp, "...processing extended HTML\n"));
-	context->extended_html = TRUE;
+	me->extended_html = TRUE;
     }
 
     return;
@@ -858,23 +855,23 @@
 /*	Handle marked
  *	-------------
  */
-static void handle_marked(HTStream *context)
+static void handle_marked(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Marked Section:\n<%s>\n", s));
 
-    if (!StrNCmp(context->string->data, "![INCLUDE[", 10)) {
-	context->string->data[context->string->size - 3] = '\0';
-	StrAllocCat(context->include, context->string->data + 10);
+    if (!StrNCmp(me->string->data, "![INCLUDE[", 10)) {
+	me->string->data[me->string->size - 3] = '\0';
+	StrAllocCat(me->include, me->string->data + 10);
 	/* @@@ This needs to take charset into account! @@@
 	   the wrong assumptions will be made about the data's
 	   charset once it is in include - kw */
 
-    } else if (!StrNCmp(context->string->data, "![CDATA[", 8)) {
-	(*context->actions->put_block) (context->target,
-					context->string->data + 8,
-					context->string->size - 11);
+    } else if (!StrNCmp(me->string->data, "![CDATA[", 8)) {
+	(*me->actions->put_block) (me->target,
+				   me->string->data + 8,
+				   me->string->size - 11);
 
     }
     return;
@@ -883,16 +880,16 @@
 /*	Handle processing instruction
  *	-----------------------------
  */
-static void handle_processing_instruction(HTStream *context)
+static void handle_processing_instruction(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Processing instruction:\n<%s>\n", s));
 
     if (!StrNCmp(s, "?xml ", 5)) {
-	int flag = context->T.decode_utf8;
+	int flag = me->T.decode_utf8;
 
-	context->strict_xml = TRUE;
+	me->strict_xml = TRUE;
 	/*
 	 * Switch to UTF-8 if the encoding is explicitly "utf-8".
 	 */
@@ -907,7 +904,7 @@
 	    }
 	    if (flag) {
 		CTRACE((tfp, "...Use UTF-8 for XML\n"));
-		context->T.decode_utf8 = TRUE;
+		me->T.decode_utf8 = TRUE;
 	    }
 	}
     }
@@ -918,9 +915,9 @@
 /*	Handle sgmlent
  *	--------------
  */
-static void handle_sgmlent(HTStream *context)
+static void handle_sgmlent(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Entity Declaration:\n<%s>\n", s));
 
@@ -930,9 +927,9 @@
 /*	Handle sgmlent
  *	--------------
  */
-static void handle_sgmlele(HTStream *context)
+static void handle_sgmlele(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Element Declaration:\n<%s>\n", s));
 
@@ -942,9 +939,9 @@
 /*	Handle sgmlatt
  *	--------------
  */
-static void handle_sgmlatt(HTStream *context)
+static void handle_sgmlatt(HTStream *me)
 {
-    const char *s = context->string->data;
+    const char *s = me->string->data;
 
     CTRACE((tfp, "SGML Attribute Declaration:\n<%s>\n", s));
 
@@ -955,8 +952,8 @@
  * Convenience macros - tags (elements) are identified sometimes by an int or
  * enum value ('TAGNUM'), sometimes by a pointer to HTTag ('TAGP').  - kw
  */
-#define TAGNUM_OF_TAGP(t) (HTMLElement) (t - context->dtd->tags)
-#define TAGP_OF_TAGNUM(e) (context->dtd->tags + e)
+#define TAGNUM_OF_TAGP(t) (HTMLElement) (t - me->dtd->tags)
+#define TAGP_OF_TAGNUM(e) (me->dtd->tags + e)
 
 /*
  * The following implement special knowledge about OBJECT.  As long as
@@ -1024,34 +1021,34 @@
     return result;
 }
 
-static void do_close_stacked(HTStream *context)
+static void do_close_stacked(HTStream *me)
 {
-    HTElement *stacked = context->element_stack;
+    HTElement *stacked = me->element_stack;
     HTMLElement e;
 
     if (!stacked)
 	return;			/* stack was empty */
-    if (context->inSELECT && !strcasecomp(stacked->tag->name, "SELECT")) {
-	context->inSELECT = FALSE;
+    if (me->inSELECT && !strcasecomp(stacked->tag->name, "SELECT")) {
+	me->inSELECT = FALSE;
     }
     e = NORMAL_TAGNUM(TAGNUM_OF_TAGP(stacked->tag));
 #ifdef USE_PRETTYSRC
     if (!psrc_view)		/* Don't actually pass call on if viewing psrc - kw */
 #endif
-	(*context->actions->end_element) (context->target,
-					  (int) e,
-					  &context->include);
-    context->element_stack = stacked->next;
+	(*me->actions->end_element) (me->target,
+				     (int) e,
+				     &me->include);
+    me->element_stack = stacked->next;
     pool_free(stacked);
-    context->no_lynx_specialcodes =
-	(BOOL) (context->element_stack
-		? (context->element_stack->tag->flags & Tgf_nolyspcl)
+    me->no_lynx_specialcodes =
+	(BOOL) (me->element_stack
+		? (me->element_stack->tag->flags & Tgf_nolyspcl)
 		: NO);
 }
 
-static int is_on_stack(HTStream *context, HTTag * old_tag)
+static int is_on_stack(HTStream *me, HTTag * old_tag)
 {
-    HTElement *stacked = context->element_stack;
+    HTElement *stacked = me->element_stack;
     int i = 1;
 
     for (; stacked; stacked = stacked->next, i++) {
@@ -1065,39 +1062,39 @@
 /*	End element
  *	-----------
  */
-static void end_element(HTStream *context, HTTag * old_tag)
+static void end_element(HTStream *me, HTTag * old_tag)
 {
     BOOL extra_action_taken = NO;
     canclose_t canclose_check = close_valid;
-    int stackpos = is_on_stack(context, old_tag);
+    int stackpos = is_on_stack(me, old_tag);
 
     if (!Old_DTD) {
 	while (canclose_check != close_NO &&
-	       context->element_stack &&
+	       me->element_stack &&
 	       (stackpos > 1 || (!extra_action_taken && stackpos == 0))) {
 	    if (stackpos == 0 && (old_tag->flags & Tgf_startO) &&
-		element_valid_within(old_tag, context->element_stack->tag, YES)) {
+		element_valid_within(old_tag, me->element_stack->tag, YES)) {
 		CTRACE((tfp, "SGML: </%s> ignored\n", old_tag->name));
 		return;
 	    }
-	    canclose_check = can_close(old_tag, context->element_stack->tag);
+	    canclose_check = can_close(old_tag, me->element_stack->tag);
 	    if (canclose_check != close_NO) {
 		CTRACE((tfp, "SGML: End </%s> \t<- %s end </%s>\n",
-			context->element_stack->tag->name,
+			me->element_stack->tag->name,
 			((canclose_check == close_valid)
 			 ? "supplied,"
 			 : "***forced by"),
 			old_tag->name));
-		do_close_stacked(context);
+		do_close_stacked(me);
 		extra_action_taken = YES;
-		stackpos = is_on_stack(context, old_tag);
+		stackpos = is_on_stack(me, old_tag);
 	    }
 	}
 
 	if (stackpos == 0 && old_tag->contents != SGML_EMPTY) {
 	    CTRACE((tfp, "SGML: Still open %s, ***no open %s for </%s>\n",
-		    context->element_stack ?
-		    context->element_stack->tag->name : "none",
+		    me->element_stack ?
+		    me->element_stack->tag->name : "none",
 		    old_tag->name,
 		    old_tag->name));
 	    return;
@@ -1106,8 +1103,8 @@
 	    CTRACE((tfp,
 		    "SGML: Nesting <%s>...<%s> \t<- ***invalid end </%s>\n",
 		    old_tag->name,
-		    context->element_stack ?
-		    context->element_stack->tag->name : "none",
+		    me->element_stack ?
+		    me->element_stack->tag->name : "none",
 		    old_tag->name));
 	    return;
 	}
@@ -1117,12 +1114,12 @@
     /*
      * If we are in a SELECT block, ignore anything but a SELECT end tag.  - FM
      */
-    if (context->inSELECT) {
+    if (me->inSELECT) {
 	if (!strcasecomp(old_tag->name, "SELECT")) {
 	    /*
 	     * Turn off the inSELECT flag and fall through.  - FM
 	     */
-	    context->inSELECT = FALSE;
+	    me->inSELECT = FALSE;
 	} else {
 	    /*
 	     * Ignore the end tag.  - FM
@@ -1142,18 +1139,18 @@
 	return;
     }
 #ifdef WIND_DOWN_STACK
-    while (context->element_stack)	/* Loop is error path only */
+    while (me->element_stack)	/* Loop is error path only */
 #else
-    if (context->element_stack)	/* Substitute and remove one stack element */
+    if (me->element_stack)	/* Substitute and remove one stack element */
 #endif /* WIND_DOWN_STACK */
     {
 	int status = HT_OK;
 	HTMLElement e;
-	HTElement *N = context->element_stack;
+	HTElement *N = me->element_stack;
 	HTTag *t = (N->tag != old_tag) ? NORMAL_TAGP(N->tag) : N->tag;
 
 	if (old_tag != t) {	/* Mismatch: syntax error */
-	    if (context->element_stack->next) {		/* This is not the last level */
+	    if (me->element_stack->next) {	/* This is not the last level */
 		CTRACE((tfp,
 			"SGML: Found </%s> when expecting </%s>. </%s> ***assumed.\n",
 			old_tag->name, t->name, t->name));
@@ -1170,27 +1167,27 @@
 #ifdef USE_PRETTYSRC
 	if (!psrc_view)		/* Don't actually pass call on if viewing psrc - kw */
 #endif
-	    status = (*context->actions->end_element) (context->target,
-						       (int) e,
-						       &context->include);
+	    status = (*me->actions->end_element) (me->target,
+						  (int) e,
+						  &me->include);
 	if (status == HT_PARSER_REOPEN_ELT) {
 	    CTRACE((tfp, "SGML: Restart <%s>\n", t->name));
-	    (*context->actions->start_element) (context->target,
-						(int) e,
-						NULL,
-						NULL,
-						context->current_tag_charset,
-						&context->include);
+	    (*me->actions->start_element) (me->target,
+					   (int) e,
+					   NULL,
+					   NULL,
+					   me->current_tag_charset,
+					   &me->include);
 	} else if (status == HT_PARSER_OTHER_CONTENT) {
 	    CTRACE((tfp, "SGML: Continue with other content model for <%s>\n", t->name));
-	    context->element_stack->tag = ALT_TAGP_OF_TAGNUM(e);
+	    me->element_stack->tag = ALT_TAGP_OF_TAGNUM(e);
 	} else {
-	    context->element_stack = N->next;	/* Remove from stack */
+	    me->element_stack = N->next;	/* Remove from stack */
 	    pool_free(N);
 	}
-	context->no_lynx_specialcodes =
-	    (BOOL) (context->element_stack
-		    ? (context->element_stack->tag->flags & Tgf_nolyspcl)
+	me->no_lynx_specialcodes =
+	    (BOOL) (me->element_stack
+		    ? (me->element_stack->tag->flags & Tgf_nolyspcl)
 		    : NO);
 #ifdef WIND_DOWN_STACK
 	if (old_tag == t)
@@ -1208,10 +1205,10 @@
 
 /*	Start a element
 */
-static void start_element(HTStream *context)
+static void start_element(HTStream *me)
 {
     int status;
-    HTTag *new_tag = context->current_tag;
+    HTTag *new_tag = me->current_tag;
     HTMLElement e = TAGNUM_OF_TAGP(new_tag);
     BOOL ok = FALSE;
 
@@ -1221,44 +1218,44 @@
     canclose_t canclose_check = close_valid;
 
     if (!Old_DTD) {
-	while (context->element_stack &&
+	while (me->element_stack &&
 	       (canclose_check == close_valid ||
 		(canclose_check == close_error &&
-		 new_tag == context->element_stack->tag)) &&
+		 new_tag == me->element_stack->tag)) &&
 	       !(valid = element_valid_within(new_tag,
-					      context->element_stack->tag,
+					      me->element_stack->tag,
 					      direct_container))) {
-	    canclose_check = can_close(new_tag, context->element_stack->tag);
+	    canclose_check = can_close(new_tag, me->element_stack->tag);
 	    if (canclose_check != close_NO) {
 		CTRACE((tfp, "SGML: End </%s> \t<- %s start <%s>\n",
-			context->element_stack->tag->name,
+			me->element_stack->tag->name,
 			((canclose_check == close_valid)
 			 ? "supplied,"
 			 : "***forced by"),
 			new_tag->name));
-		do_close_stacked(context);
+		do_close_stacked(me);
 		extra_action_taken = YES;
 		if (canclose_check == close_error)
 		    direct_container = NO;
 	    } else {
 		CTRACE((tfp,
 			"SGML: Still open %s \t<- ***invalid start <%s>\n",
-			context->element_stack->tag->name,
+			me->element_stack->tag->name,
 			new_tag->name));
 	    }
 	}
-	if (context->element_stack && !valid &&
-	    (context->element_stack->tag->flags & Tgf_strict) &&
+	if (me->element_stack && !valid &&
+	    (me->element_stack->tag->flags & Tgf_strict) &&
 	    !(valid = element_valid_within(new_tag,
-					   context->element_stack->tag,
+					   me->element_stack->tag,
 					   direct_container))) {
 	    CTRACE((tfp, "SGML: Still open %s \t<- ***ignoring start <%s>\n",
-		    context->element_stack->tag->name,
+		    me->element_stack->tag->name,
 		    new_tag->name));
 	    return;
 	}
 
-	if (context->element_stack &&
+	if (me->element_stack &&
 	    !extra_action_taken &&
 	    (canclose_check == close_NO) &&
 	    !valid && (new_tag->flags & Tgf_mafse)) {
@@ -1266,25 +1263,25 @@
 	    int i = 0;
 
 	    for (; i < new_tag->number_of_attributes && !has_attributes; i++)
-		has_attributes = context->present[i];
+		has_attributes = me->present[i];
 	    if (!has_attributes) {
 		CTRACE((tfp,
 			"SGML: Still open %s, ***converting invalid <%s> to </%s>\n",
-			context->element_stack->tag->name,
+			me->element_stack->tag->name,
 			new_tag->name,
 			new_tag->name));
-		end_element(context, new_tag);
+		end_element(me, new_tag);
 		return;
 	    }
 	}
 
-	if (context->element_stack &&
+	if (me->element_stack &&
 	    (canclose_check == close_error) &&
 	    !element_valid_within(new_tag,
-				  context->element_stack->tag,
+				  me->element_stack->tag,
 				  direct_container)) {
 	    CTRACE((tfp, "SGML: Still open %s \t<- ***invalid start <%s>\n",
-		    context->element_stack->tag->name,
+		    me->element_stack->tag->name,
 		    new_tag->name));
 	}
     }
@@ -1296,7 +1293,7 @@
      * terminate the SELECT block if it is any other form-related element, and
      * otherwise ignore it.  - FM
      */
-    if (!context->inSELECT) {
+    if (!me->inSELECT) {
 	/*
 	 * We are not in a SELECT block, so check if this starts one.  - FM
 	 * (frequent case!)
@@ -1306,7 +1303,7 @@
 	    /*
 	     * Set the inSELECT flag and fall through.  - FM
 	     */
-	    context->inSELECT = TRUE;
+	    me->inSELECT = TRUE;
 	}
     } else {
 	/*
@@ -1338,7 +1335,7 @@
 		CTRACE((tfp,
 			"SGML: ***Faking SELECT end tag before <%s> start tag.\n",
 			new_tag->name));
-		end_element(context, SGMLFindTag(context->dtd, "SELECT"));
+		end_element(me, SGMLFindTag(me->dtd, "SELECT"));
 	    } else {
 		/*
 		 * Ignore the start tag.  - FM
@@ -1354,12 +1351,12 @@
      * Handle the start tag.  - FM
      */
     CTRACE((tfp, "SGML: Start <%s>\n", new_tag->name));
-    status = (*context->actions->start_element) (context->target,
-						 (int) TAGNUM_OF_TAGP(new_tag),
-						 context->present,
-						 (STRING2PTR) context->value,	/* coerce type for think c */
-						 context->current_tag_charset,
-						 &context->include);
+    status = (*me->actions->start_element) (me->target,
+					    (int) TAGNUM_OF_TAGP(new_tag),
+					    me->present,
+					    (STRING2PTR) me->value,	/* coerce type for think c */
+					    me->current_tag_charset,
+					    &me->include);
     if (status == HT_PARSER_OTHER_CONTENT)
 	new_tag = ALT_TAGP(new_tag);	/* this is only returned for OBJECT */
     if (new_tag->contents != SGML_EMPTY) {	/* i.e., tag not empty */
@@ -1370,16 +1367,16 @@
 
 	assert(N != NULL);
 
-	N->next = context->element_stack;
+	N->next = me->element_stack;
 	N->tag = new_tag;
-	context->element_stack = N;
-	context->no_lynx_specialcodes = (BOOLEAN) (new_tag->flags & Tgf_nolyspcl);
+	me->element_stack = N;
+	me->no_lynx_specialcodes = (BOOLEAN) (new_tag->flags & Tgf_nolyspcl);
 
     } else if (e == HTML_META) {
 	/*
 	 * Check for result of META tag.  - KW & FM
 	 */
-	change_chartrans_handling(context);
+	change_chartrans_handling(me);
     }
 }
 
@@ -1437,7 +1434,7 @@
 /*	Could check that we are back to bottom of stack! @@  */
 /*	Do check! - FM					     */
 /*							     */
-static void SGML_free(HTStream *context)
+static void SGML_free(HTStream *me)
 {
     int i;
     HTElement *cur;
@@ -1446,49 +1443,49 @@
     /*
      * Free the buffers.  - FM
      */
-    FREE(context->recover);
-    FREE(context->url);
-    FREE(context->csi);
-    FREE(context->include);
-    FREE(context->active_include);
+    FREE(me->recover);
+    FREE(me->url);
+    FREE(me->csi);
+    FREE(me->include);
+    FREE(me->active_include);
 
     /*
      * Wind down stack if any elements are open.  - FM
      */
-    while (context->element_stack) {
-	cur = context->element_stack;
+    while (me->element_stack) {
+	cur = me->element_stack;
 	t = cur->tag;
-	context->element_stack = cur->next;	/* Remove from stack */
+	me->element_stack = cur->next;	/* Remove from stack */
 	pool_free(cur);
 #ifdef USE_PRETTYSRC
 	if (!psrc_view)		/* Don't actually call on target if viewing psrc - kw */
 #endif
-	    (*context->actions->end_element)
-		(context->target,
+	    (*me->actions->end_element)
+		(me->target,
 		 (int) NORMAL_TAGNUM(TAGNUM_OF_TAGP(t)),
-		 &context->include);
-	FREE(context->include);
+		 &me->include);
+	FREE(me->include);
     }
 
     /*
      * Finish off the target.  - FM
      */
-    (*context->actions->_free) (context->target);
+    (*me->actions->_free) (me->target);
 
     /*
      * Free the strings and context structure.  - FM
      */
-    HTChunkFree(context->string);
+    HTChunkFree(me->string);
     for (i = 0; i < MAX_ATTRIBUTES; i++)
-	FREE_extra(context->value[i]);
-    FREE(context);
+	FREE_extra(me->value[i]);
+    FREE(me);
 
 #ifdef USE_PRETTYSRC
     sgml_in_psrc_was_initialized = FALSE;
 #endif
 }
 
-static void SGML_abort(HTStream *context, HTError e)
+static void SGML_abort(HTStream *me, HTError e)
 {
     int i;
     HTElement *cur;
@@ -1496,33 +1493,33 @@
     /*
      * Abort the target.  - FM
      */
-    (*context->actions->_abort) (context->target, e);
+    (*me->actions->_abort) (me->target, e);
 
     /*
      * Free the buffers.  - FM
      */
-    FREE(context->recover);
-    FREE(context->include);
-    FREE(context->active_include);
-    FREE(context->url);
-    FREE(context->csi);
+    FREE(me->recover);
+    FREE(me->include);
+    FREE(me->active_include);
+    FREE(me->url);
+    FREE(me->csi);
 
     /*
      * Free stack memory if any elements were left open.  - KW
      */
-    while (context->element_stack) {
-	cur = context->element_stack;
-	context->element_stack = cur->next;	/* Remove from stack */
+    while (me->element_stack) {
+	cur = me->element_stack;
+	me->element_stack = cur->next;	/* Remove from stack */
 	pool_free(cur);
     }
 
     /*
      * Free the strings and context structure.  - FM
      */
-    HTChunkFree(context->string);
+    HTChunkFree(me->string);
     for (i = 0; i < MAX_ATTRIBUTES; i++)
-	FREE_extra(context->value[i]);
-    FREE(context);
+	FREE_extra(me->value[i]);
+    FREE(me);
 
 #ifdef USE_PRETTYSRC
     sgml_in_psrc_was_initialized = FALSE;
@@ -1538,21 +1535,21 @@
  */
 
 #ifdef CALLERDATA
-void *SGML_callerData(HTStream *context)
+void *SGML_callerData(HTStream *me)
 {
-    return context->callerData;
+    return me->callerData;
 }
 
-void SGML_setCallerData(HTStream *context, void *data)
+void SGML_setCallerData(HTStream *me, void *data)
 {
-    context->callerData = data;
+    me->callerData = data;
 }
 #endif /* CALLERDATA */
 
 #ifdef USE_PRETTYSRC
-static void transform_tag(HTStream *context, HTChunk *string)
+static void transform_tag(HTStream *me, HTChunk *string)
 {
-    if (!context->strict_xml) {
+    if (!me->strict_xml) {
 	if (tagname_transform != 1) {
 	    if (tagname_transform == 0)
 		LYLowerCase(string->data);
@@ -1583,41 +1580,41 @@
     return result;
 }
 
-static void discard_empty(HTStream *context)
+static void discard_empty(HTStream *me)
 {
     static HTTag empty_tag;
 
     CTRACE((tfp, "SGML discarding empty %s\n",
-	    NonNull(context->current_tag->name)));
+	    NonNull(me->current_tag->name)));
     CTRACE_FLUSH(tfp);
 
     memset(&empty_tag, 0, sizeof(empty_tag));
-    context->current_tag = &empty_tag;
-    context->string->size = 0;
+    me->current_tag = &empty_tag;
+    me->string->size = 0;
 
     /* do not call end_element() if start_element() was not called */
 }
 
 #ifdef USE_PRETTYSRC
-static BOOL end_if_prettysrc(HTStream *context, HTChunk *string, int end_ch)
+static BOOL end_if_prettysrc(HTStream *me, HTChunk *string, int end_ch)
 {
     BOOL result = psrc_view;
 
     if (psrc_view) {
 	if (attr_is_name) {
-	    HTStartAnchor(context->target, string->data, NULL);
-	    (*context->actions->end_element) (context->target,
-					      HTML_A,
-					      &context->include);
+	    HTStartAnchor(me->target, string->data, NULL);
+	    (*me->actions->end_element) (me->target,
+					 HTML_A,
+					 &me->include);
 	} else if (attr_is_href) {
 	    PSRCSTART(href);
-	    HTStartAnchor(context->target, NULL, string->data);
+	    HTStartAnchor(me->target, NULL, string->data);
 	}
 	PUTS_TR(string->data);
 	if (attr_is_href) {
-	    (*context->actions->end_element) (context->target,
-					      HTML_A,
-					      &context->include);
+	    (*me->actions->end_element) (me->target,
+					 HTML_A,
+					 &me->include);
 	    PSRCSTOP(href);
 	}
 	if (end_ch)
@@ -1628,10 +1625,10 @@
 }
 #endif
 
-static void SGML_character(HTStream *context, int c_in)
+static void SGML_character(HTStream *me, int c_in)
 {
-    const SGML_dtd *dtd = context->dtd;
-    HTChunk *string = context->string;
+    const SGML_dtd *dtd = me->dtd;
+    HTChunk *string = me->string;
     const char *EntityName;
     HTTag *testtag = NULL;
     BOOLEAN chk;		/* Helps (?) walk through all the else ifs... */
@@ -1643,152 +1640,78 @@
 
     ++sgml_offset;
 
-    /*
-     * Now some fun with the preprocessor.  Use copies for c and unsign_c ==
-     * clong, so that we can revert back to the unchanged c_in.  - KW
-     */
-#define unsign_c clong
-
     c = UCH(c_in);
-    clong = UCH(c);		/* a.k.a. unsign_c */
+    clong = UCH(c);
 
-    if (context->T.decode_utf8) {
-	/*
-	 * Combine UTF-8 into Unicode.  Incomplete characters silently ignored. 
-	 * From Linux kernel's console.c.  - KW
-	 */
-	if (TOASCII(UCH(c)) > 127) {	/* S/390 -- gil -- 0710 */
-	    /*
-	     * We have an octet from a multibyte character.  - FM
-	     */
-	    if (context->utf_count > 0 && (TOASCII(c) & 0xc0) == 0x80) {
-		context->utf_char = (context->utf_char << 6) | (TOASCII(c) & 0x3f);
-		context->utf_count--;
-		*(context->utf_buf_p) = (char) c;
-		(context->utf_buf_p)++;
-		if (context->utf_count == 0) {
-		    /*
-		     * We have all of the bytes, so terminate the buffer and
-		     * set 'clong' to the UCode_t value.  - FM
-		     */
-		    *(context->utf_buf_p) = '\0';
-		    clong = context->utf_char;
-		    if (clong < 256) {
-			c = UCH(clong & 0xff);
-		    }
-		    /* lynx does not use left-to-right */
-		    if (clong == 0x200e)
-			return;
-		    goto top1;
-		} else {
-		    /*
-		     * Wait for more.  - KW
-		     */
-		    return;
-		}
-	    } else {
-		/*
-		 * Start handling a new multibyte character.  - FM
-		 */
-		context->utf_buf_p = context->utf_buf;
-		*(context->utf_buf_p) = (char) c;
-		(context->utf_buf_p)++;
-		if ((c & 0xe0) == 0xc0) {
-		    context->utf_count = 1;
-		    context->utf_char = (c & 0x1f);
-		} else if ((c & 0xf0) == 0xe0) {
-		    context->utf_count = 2;
-		    context->utf_char = (c & 0x0f);
-		} else if ((c & 0xf8) == 0xf0) {
-		    context->utf_count = 3;
-		    context->utf_char = (c & 0x07);
-		} else if ((c & 0xfc) == 0xf8) {
-		    context->utf_count = 4;
-		    context->utf_char = (c & 0x03);
-		} else if ((c & 0xfe) == 0xfc) {
-		    context->utf_count = 5;
-		    context->utf_char = (c & 0x01);
-		} else {
-		    /*
-		     * Garbage.  - KW
-		     */
-		    context->utf_count = 0;
-		    context->utf_buf_p = context->utf_buf;
-		    *(context->utf_buf_p) = '\0';
-		}
-		/*
-		 * Wait for more.  - KW
-		 */
-		return;
+    if (me->T.decode_utf8) {
+	switch (HTDecodeUTF8(&(me->U), &c_in, &clong)) {
+	case dUTF8_ok:
+	    if (clong < 256) {
+		c_in = FROMASCII(UCH(clong));
 	    }
-	} else {
-	    /*
-	     * Got an ASCII char.  - KW
-	     */
-	    context->utf_count = 0;
-	    context->utf_buf_p = context->utf_buf;
-	    *(context->utf_buf_p) = '\0';
-	    /*  goto top;  */
+	    break;
+	case dUTF8_err:
+	    clong = UCS_REPL;
+	    strcpy(me->U.utf_buf, "\357\277\275");
+	    me->U.utf_buf_p = (me->U.utf_buf + 3);
+	    break;
+	case dUTF8_more:
+	    return;
+	}
+
+	c = UCH(c_in);
+	if ((me->U.utf_buf_p - me->U.utf_buf) > 1) {
+	    goto top1;
 	}
     }
-    /* end of context->T.decode_utf8      S/390 -- gil -- 0726 */
-#ifdef NOTDEFINED
-    /*
-     * If we have a koi8-r input and do not have koi8-r as the output, save the
-     * raw input in saved_char_in before we potentially convert it to Unicode. 
-     * - FM
-     */
-    if (context->T.strip_raw_char_in)
-	saved_char_in = c;
-#endif /* NOTDEFINED */
 
     /*
      * If we want the raw input converted to Unicode, try that now.  - FM
      */
-    if (context->T.trans_to_uni &&
+    if (me->T.trans_to_uni &&
 #ifdef EXP_JAPANESEUTF8_SUPPORT
-	((strcmp(LYCharSet_UC[context->inUCLYhndl].MIMEname, "euc-jp") == 0) ||
-	 (strcmp(LYCharSet_UC[context->inUCLYhndl].MIMEname, "shift_jis") == 0))) {
-	if (strcmp(LYCharSet_UC[context->inUCLYhndl].MIMEname, "shift_jis") == 0) {
-	    if (context->utf_count == 0) {
+	((strcmp(LYCharSet_UC[me->inUCLYhndl].MIMEname, "euc-jp") == 0) ||
+	 (strcmp(LYCharSet_UC[me->inUCLYhndl].MIMEname, "shift_jis") == 0))) {
+	if (strcmp(LYCharSet_UC[me->inUCLYhndl].MIMEname, "shift_jis") == 0) {
+	    if (me->U.utf_count == 0) {
 		if (IS_SJIS_HI1((unsigned char) c) ||
 		    IS_SJIS_HI2((unsigned char) c)) {
-		    context->utf_buf[0] = (char) c;
-		    context->utf_count = 1;
+		    me->U.utf_buf[0] = (char) c;
+		    me->U.utf_count = 1;
 		    clong = -11;
 		}
 	    } else {
 		if (IS_SJIS_LO((unsigned char) c)) {
-		    context->utf_buf[1] = (char) c;
-		    clong = UCTransJPToUni(context->utf_buf, 2, context->inUCLYhndl);
+		    me->U.utf_buf[1] = (char) c;
+		    clong = UCTransJPToUni(me->U.utf_buf, 2, me->inUCLYhndl);
 		}
-		context->utf_count = 0;
+		me->U.utf_count = 0;
 	    }
 	} else {
-	    if (context->utf_count == 0) {
+	    if (me->U.utf_count == 0) {
 		if (IS_EUC_HI((unsigned char) c)) {
-		    context->utf_buf[0] = (char) c;
-		    context->utf_count = 1;
+		    me->U.utf_buf[0] = (char) c;
+		    me->U.utf_count = 1;
 		    clong = -11;
 		}
 	    } else {
 		if (IS_EUC_LOX((unsigned char) c)) {
-		    context->utf_buf[1] = (char) c;
-		    clong = UCTransJPToUni(context->utf_buf, 2, context->inUCLYhndl);
+		    me->U.utf_buf[1] = (char) c;
+		    clong = UCTransJPToUni(me->U.utf_buf, 2, me->inUCLYhndl);
 		}
-		context->utf_count = 0;
+		me->U.utf_count = 0;
 	    }
 	}
 	goto top1;
-    } else if (context->T.trans_to_uni &&
+    } else if (me->T.trans_to_uni &&
 #endif
-	       ((TOASCII(unsign_c) >= LYlowest_eightbit[context->inUCLYhndl]) ||	/* S/390 -- gil -- 0744 */
-		(unsign_c < ' ' && unsign_c != 0 &&
-		 context->T.trans_C0_to_uni))) {
+	       ((TOASCII(clong) >= LYlowest_eightbit[me->inUCLYhndl]) ||	/* S/390 -- gil -- 0744 */
+		(clong < ' ' && clong != 0 &&
+		 me->T.trans_C0_to_uni))) {
 	/*
 	 * Convert the octet to Unicode.  - FM
 	 */
-	clong = UCTransToUni((char) c, context->inUCLYhndl);
+	clong = UCTransToUni((char) c, me->inUCLYhndl);
 	if (clong > 0) {
 	    saved_char_in = c;
 	    if (clong < 256) {
@@ -1796,15 +1719,15 @@
 	    }
 	}
 	goto top1;
-    } else if (unsign_c < ' ' && unsign_c != 0 &&	/* S/390 -- gil -- 0768 */
-	       context->T.trans_C0_to_uni) {
+    } else if (clong < ' ' && clong != 0 &&	/* S/390 -- gil -- 0768 */
+	       me->T.trans_C0_to_uni) {
 	/*
 	 * This else if may be too ugly to keep.  - KW
 	 */
-	if (context->T.trans_from_uni &&
-	    (((clong = UCTransToUni((char) c, context->inUCLYhndl)) >= ' ') ||
-	     (context->T.transp &&
-	      (clong = UCTransToUni((char) c, context->inUCLYhndl)) > 0))) {
+	if (me->T.trans_from_uni &&
+	    (((clong = UCTransToUni((char) c, me->inUCLYhndl)) >= ' ') ||
+	     (me->T.transp &&
+	      (clong = UCTransToUni((char) c, me->inUCLYhndl)) > 0))) {
 	    saved_char_in = c;
 	    if (clong < 256) {
 		c = FROMASCII(UCH(clong));
@@ -1812,15 +1735,15 @@
 	    goto top1;
 	} else {
 	    uck = -1;
-	    if (context->T.transp) {
+	    if (me->T.transp) {
 		uck = UCTransCharStr(replace_buf, 60, (char) c,
-				     context->inUCLYhndl,
-				     context->inUCLYhndl, NO);
+				     me->inUCLYhndl,
+				     me->inUCLYhndl, NO);
 	    }
-	    if (!context->T.transp || uck < 0) {
+	    if (!me->T.transp || uck < 0) {
 		uck = UCTransCharStr(replace_buf, 60, (char) c,
-				     context->inUCLYhndl,
-				     context->outUCLYhndl, YES);
+				     me->inUCLYhndl,
+				     me->outUCLYhndl, YES);
 	    }
 	    if (uck == 0) {
 		return;
@@ -1829,59 +1752,54 @@
 	    }
 	    c = UCH(replace_buf[0]);
 	    if (c && replace_buf[1]) {
-		if (context->state == S_text) {
+		if (me->state == S_text) {
 		    PUTS(replace_buf);
 		    return;
 		}
-		StrAllocCat(context->recover, replace_buf + 1);
+		StrAllocCat(me->recover, replace_buf + 1);
 	    }
 	    goto top0a;
 	}			/*  Next line end of ugly stuff for C0. - KW */
-    } else {			/* end of context->T.trans_to_uni  S/390 -- gil -- 0791 */
+    } else {			/* end of me->T.trans_to_uni  S/390 -- gil -- 0791 */
 	goto top0a;
     }
 
     /*
-     * At this point we have either unsign_c a.k.a.  clong in Unicode (and c in
-     * latin1 if clong is in the latin1 range), or unsign_c and c will have to
-     * be passed raw.  - KW
+     *  We jump up to here from below if we have
+     *  stuff in the recover, insert, or csi buffers
+     *  to process.      We zero saved_char_in, in effect
+     *  as a flag that the octet is not that of the
+     *  actual call to this function.  This may be OK
+     *  for now, for the stuff this function adds to
+     *  its recover buffer, but it might not be for
+     *  stuff other functions added to the insert or
+     *  csi buffer, so bear that in mind. - FM
+     *  Stuff from the recover buffer is now handled
+     *  as UTF-8 if we can expect that's what it is,
+     *  and in that case we don't come back up here. - kw
      */
-/*
- *  We jump up to here from below if we have
- *  stuff in the recover, insert, or csi buffers
- *  to process.	 We zero saved_char_in, in effect
- *  as a flag that the octet is not that of the
- *  actual call to this function.  This may be OK
- *  for now, for the stuff this function adds to
- *  its recover buffer, but it might not be for
- *  stuff other functions added to the insert or
- *  csi buffer, so bear that in mind. - FM
- *  Stuff from the recover buffer is now handled
- *  as UTF-8 if we can expect that's what it is,
- *  and in that case we don't come back up here. - kw
- */
   top:
     saved_char_in = '\0';
-/*
- *  We jump to here from above when we don't have
- *  UTF-8 input, haven't converted to Unicode, and
- *  want clong set to the input octet (unsigned)
- *  without zeroing its saved_char_in copy (which
- *  is signed). - FM
- */
+    /*
+     *  We jump to here from above when we don't have
+     *  UTF-8 input, haven't converted to Unicode, and
+     *  want clong set to the input octet (unsigned)
+     *  without zeroing its saved_char_in copy (which
+     *  is signed). - FM
+     */
   top0a:
-    *(context->utf_buf) = '\0';
+    *(me->U.utf_buf) = '\0';
     clong = UCH(c);
-/*
- *  We jump to here from above if we have converted
- *  the input, or a multibyte sequence across calls,
- *  to a Unicode value and loaded it into clong (to
- *  which unsign_c has been defined), and from below
- *  when we are recycling a character (e.g., because
- *  it terminated an entity but is not the standard
- *  semi-colon).  The character will already have
- *  been put through the Unicode conversions. - FM
- */
+    /*
+     *  We jump to here from above if we have converted
+     *  the input, or a multibyte sequence across calls,
+     *  to a Unicode value and loaded it into clong (to
+     *  which unsign_c has been defined), and from below
+     *  when we are recycling a character (e.g., because
+     *  it terminated an entity but is not the standard
+     *  semi-colon).  The character will already have
+     *  been put through the Unicode conversions. - FM
+     */
   top1:
     /*
      * Ignore low ISO 646 7-bit control characters if HTCJK is not set.  - FM
@@ -1890,7 +1808,7 @@
      * Works for both ASCII and EBCDIC. -- gil
      * S/390 -- gil -- 0811
      */
-    if (TOASCII(unsign_c) < 32 &&
+    if (TOASCII(clong) < 32 &&
 	c != '\t' && c != '\n' && c != '\r' &&
 	!IS_CJK_TTY)
 	goto after_switch;
@@ -1898,8 +1816,8 @@
     /*
      * Ignore 127 if we don't have HTPassHighCtrlRaw or HTCJK set.  - FM
      */
-#define PASSHICTRL (context->T.transp || \
-		    unsign_c >= LYlowest_eightbit[context->inUCLYhndl])
+#define PASSHICTRL (me->T.transp || \
+		    clong >= LYlowest_eightbit[me->inUCLYhndl])
     if (TOASCII(c) == 127 &&	/* S/390 -- gil -- 0830 */
 	!(PASSHICTRL || IS_CJK_TTY))
 	goto after_switch;
@@ -1908,7 +1826,7 @@
      * Ignore 8-bit control characters 128 - 159 if neither HTPassHighCtrlRaw
      * nor HTCJK is set.  - FM
      */
-    if (TOASCII(unsign_c) > 127 && TOASCII(unsign_c) < 160 &&	/* S/390 -- gil -- 0847 */
+    if (TOASCII(clong) > 127 && TOASCII(clong) < 160 &&		/* S/390 -- gil -- 0847 */
 	!(PASSHICTRL || IS_CJK_TTY)) {
 	/*
 	 * If we happen to be reading from an "ISO-8859-1" or "US-ASCII"
@@ -1917,7 +1835,7 @@
 	 *
 	 * http://www.whatwg.org/specs/web-apps/current-work/multipage/infrastructure.html#character-encodings-0
 	 */
-	if (AssumeCP1252(context)) {
+	if (AssumeCP1252(me)) {
 	    clong = LYcp1252ToUnicode((UCode_t) c);
 	    goto top1;
 	}
@@ -1928,34 +1846,34 @@
      * JIS X0201 Kana is single byte. To prevent to fail SGML parsing
      * we have to take care of them here. -- TH
      */
-    if ((HTCJK == JAPANESE) && (context->state == S_in_kanji) &&
-	!IS_JAPANESE_2BYTE(context->kanji_buf, UCH(c))
+    if ((HTCJK == JAPANESE) && (me->state == S_in_kanji) &&
+	!IS_JAPANESE_2BYTE(me->kanji_buf, UCH(c))
 #ifdef EXP_JAPANESEUTF8_SUPPORT
-	&& !context->T.decode_utf8
+	&& !me->T.decode_utf8
 #endif
 	) {
 #ifdef CONV_JISX0201KANA_JISX0208KANA
-	if (IS_SJIS_X0201KANA(context->kanji_buf)) {
+	if (IS_SJIS_X0201KANA(me->kanji_buf)) {
 	    unsigned char sjis_hi, sjis_lo;
 
-	    JISx0201TO0208_SJIS(context->kanji_buf, &sjis_hi, &sjis_lo);
+	    JISx0201TO0208_SJIS(me->kanji_buf, &sjis_hi, &sjis_lo);
 	    PUTC(sjis_hi);
 	    PUTC(sjis_lo);
 	} else
 #endif
-	    PUTC(context->kanji_buf);
-	context->state = S_text;
+	    PUTC(me->kanji_buf);
+	me->state = S_text;
     }
 
     /*
-     * Handle character based on context->state.
+     * Handle character based on me->state.
      */
     CTRACE2(TRACE_SGML, (tfp, "SGML before %s|%.*s|%c|\n",
-			 state_name(context->state),
+			 state_name(me->state),
 			 string->size,
 			 NonNull(string->data),
 			 UCH(c)));
-    switch (context->state) {
+    switch (me->state) {
 
     case S_in_kanji:
 	/*
@@ -1966,27 +1884,27 @@
 	 * holding each first byte and then checking byte pairs, but that
 	 * doesn't seem worth the overhead (see below).  - FM
 	 */
-	context->state = S_text;
-	PUTC(context->kanji_buf);
+	me->state = S_text;
+	PUTC(me->kanji_buf);
 	PUTC(c);
 	break;
 
     case S_tagname_slash:
 	/*
 	 * We had something link "<name/" so far, set state to S_text but keep
-	 * context->slashedtag as a flag; except if we get '>' directly
+	 * me->slashedtag as a flag; except if we get '>' directly
 	 * after the "<name/", and really have a tag for that name in
-	 * context->slashedtag, in which case keep state as is and let code
+	 * me->slashedtag, in which case keep state as is and let code
 	 * below deal with it.  - kw
 	 */
-	if (!(c == '>' && context->slashedtag && TOASCII(unsign_c) < 127)) {
-	    context->state = S_text;
+	if (!(c == '>' && me->slashedtag && TOASCII(clong) < 127)) {
+	    me->state = S_text;
 	}
 	/* fall through in any case! */
     case S_text:
 	if (IS_CJK_TTY && ((TOASCII(c) & 0200) != 0)
 #ifdef EXP_JAPANESEUTF8_SUPPORT
-	    && !context->T.decode_utf8
+	    && !me->T.decode_utf8
 #endif
 	    ) {			/* S/390 -- gil -- 0864 */
 	    /*
@@ -1997,15 +1915,15 @@
 	     * approximations" display character set, which is largely
 	     * equivalent to having raw mode off with CJK.  - FM
 	     */
-	    context->state = S_in_kanji;
-	    context->kanji_buf = c;
+	    me->state = S_in_kanji;
+	    me->kanji_buf = c;
 	    break;
 	} else if (IS_CJK_TTY && TOASCII(c) == '\033') {	/* S/390 -- gil -- 0881 */
 	    /*
 	     * Setting up for CJK escape sequence handling (based on Takuya
 	     * ASADA's (asada@three-a.co.jp) CJK Lynx).  - FM
 	     */
-	    context->state = S_esc;
+	    me->state = S_esc;
 	    PUTC(c);
 	    break;
 	}
@@ -2013,16 +1931,16 @@
 	if (c == '&' || c == '<') {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {	/*there is nothing useful in the element_stack */
-		testtag = context->current_tag;
+		testtag = me->current_tag;
 	    } else
 #endif
 	    {
-		testtag = context->element_stack ?
-		    context->element_stack->tag : NULL;
+		testtag = me->element_stack ?
+		    me->element_stack->tag : NULL;
 	    }
 	}
 
-	if (c == '&' && TOASCII(unsign_c) < 127 &&	/* S/390 -- gil -- 0898 */
+	if (c == '&' && TOASCII(clong) < 127 &&		/* S/390 -- gil -- 0898 */
 	    (!testtag ||
 	     (testtag->contents == SGML_MIXED ||
 	      testtag->contents == SGML_ELEMENT ||
@@ -2035,28 +1953,28 @@
 	     * Setting up for possible entity, without the leading '&'.  - FM
 	     */
 	    string->size = 0;
-	    context->state = S_ero;
-	} else if (c == '<' && TOASCII(unsign_c) < 127) {	/* S/390 -- gil -- 0915 */
+	    me->state = S_ero;
+	} else if (c == '<' && TOASCII(clong) < 127) {	/* S/390 -- gil -- 0915 */
 	    /*
 	     * Setting up for possible tag.  - FM
 	     */
 	    string->size = 0;
 	    if (testtag && testtag->contents == SGML_PCDATA) {
-		context->state = S_pcdata;
+		me->state = S_pcdata;
 	    } else if (testtag && (testtag->contents == SGML_LITTERAL
 				   || testtag->contents == SGML_CDATA)) {
-		context->state = S_litteral;
+		me->state = S_litteral;
 	    } else if (testtag && (testtag->contents == SGML_SCRIPT)) {
-		context->state = S_script;
+		me->state = S_script;
 	    } else {
-		context->state = S_tag;
+		me->state = S_tag;
 	    }
-	    context->slashedtag = NULL;
-	} else if (context->slashedtag &&
-		   context->slashedtag->name &&
+	    me->slashedtag = NULL;
+	} else if (me->slashedtag &&
+		   me->slashedtag->name &&
 		   (c == '/' ||
-		    (c == '>' && context->state == S_tagname_slash)) &&
-		   TOASCII(unsign_c) < 127) {
+		    (c == '>' && me->state == S_tagname_slash)) &&
+		   TOASCII(clong) < 127) {
 	    /*
 	     * We got either the second slash of a pending "<NAME/blah blah/"
 	     * shortref construct, or the '>' of a mere "<NAME/>".  In both
@@ -2070,68 +1988,68 @@
 		PSRCSTOP(abracket);
 	    } else
 #endif
-		if (context->slashedtag != context->unknown_tag &&
-		    !ReallyEmptyTag(context->slashedtag)) {
-		if (context->recover == NULL) {
-		    StrAllocCopy(context->recover, "</");
-		    context->recover_index = 0;
+		if (me->slashedtag != me->unknown_tag &&
+		    !ReallyEmptyTag(me->slashedtag)) {
+		if (me->recover == NULL) {
+		    StrAllocCopy(me->recover, "</");
+		    me->recover_index = 0;
 		} else {
-		    StrAllocCat(context->recover, "</");
+		    StrAllocCat(me->recover, "</");
 		}
-		StrAllocCat(context->recover, context->slashedtag->name);
-		StrAllocCat(context->recover, ">");
+		StrAllocCat(me->recover, me->slashedtag->name);
+		StrAllocCat(me->recover, ">");
 	    }
-	    context->slashedtag = NULL;
+	    me->slashedtag = NULL;
 
-	} else if (context->element_stack &&
-		   (context->element_stack->tag->flags & Tgf_frecyc)) {
+	} else if (me->element_stack &&
+		   (me->element_stack->tag->flags & Tgf_frecyc)) {
 	    /*
 	     * The element stack says we are within the contents of an element
 	     * that the next stage (HTML.c) may want to feed us back again (via
 	     * the *include string).  So try to output text in UTF-8 if
 	     * possible, using the same logic as for attribute values (which
-	     * should be in line with what context->current_tag_charset
+	     * should be in line with what me->current_tag_charset
 	     * indicates).  - kw
 	     */
-	    if (context->T.decode_utf8 &&
-		*context->utf_buf) {
-		PUTS(context->utf_buf);
-		context->utf_buf_p = context->utf_buf;
-		*(context->utf_buf_p) = '\0';
+	    if (me->T.decode_utf8 &&
+		*me->U.utf_buf) {
+		PUTS(me->U.utf_buf);
+		me->U.utf_buf_p = me->U.utf_buf;
+		*(me->U.utf_buf_p) = '\0';
 	    } else if (!IS_CJK_TTY &&
-		       (context->T.output_utf8 ||
-			context->T.trans_from_uni)) {
+		       (me->T.output_utf8 ||
+			me->T.trans_from_uni)) {
 		if (LYIsASCII(clong)) {
 		    PUTC(c);
-		} else if (clong == 0xfffd && saved_char_in &&
+		} else if (clong == UCS_REPL && saved_char_in &&
 			   HTPassEightBitRaw &&
 			   saved_char_in >=
-			   LYlowest_eightbit[context->outUCLYhndl]) {
+			   LYlowest_eightbit[me->outUCLYhndl]) {
 		    PUTUTF8((UCode_t) (0xf000 | saved_char_in));
 		} else {
 		    PUTUTF8(clong);
 		}
-	    } else if (saved_char_in && context->T.use_raw_char_in) {
+	    } else if (saved_char_in && me->T.use_raw_char_in) {
 		PUTC(saved_char_in);
 	    } else {
 		PUTC(c);
 	    }
 
-#define PASS8859SPECL context->T.pass_160_173_raw
+#define PASS8859SPECL me->T.pass_160_173_raw
 	    /*
 	     * Convert 160 (nbsp) to Lynx special character if neither
 	     * HTPassHighCtrlRaw nor HTCJK is set.  - FM
 	     */
-	} else if (unsign_c == CH_NBSP &&	/* S/390 -- gil -- 0932 */
-		   !context->no_lynx_specialcodes &&
+	} else if (clong == CH_NBSP &&	/* S/390 -- gil -- 0932 */
+		   !me->no_lynx_specialcodes &&
 		   !(PASS8859SPECL || IS_CJK_TTY)) {
 	    PUTC(HT_NON_BREAK_SPACE);
 	    /*
 	     * Convert 173 (shy) to Lynx special character if neither
 	     * HTPassHighCtrlRaw nor HTCJK is set.  - FM
 	     */
-	} else if (unsign_c == CH_SHY &&	/* S/390 -- gil -- 0949 */
-		   !context->no_lynx_specialcodes &&
+	} else if (clong == CH_SHY &&	/* S/390 -- gil -- 0949 */
+		   !me->no_lynx_specialcodes &&
 		   !(PASS8859SPECL || IS_CJK_TTY)) {
 	    PUTC(LY_SOFT_HYPHEN);
 	    /*
@@ -2139,19 +2057,16 @@
 	     * doesn't need further processing (e.g., a koi8-r input for a
 	     * koi8-r output).  - FM
 	     */
-	} else if (context->T.use_raw_char_in && saved_char_in) {
+	} else if (me->T.use_raw_char_in && saved_char_in) {
 	    /*
 	     * Only if the original character is still in saved_char_in,
 	     * otherwise we may be iterating from a goto top.  - KW
 	     */
 	    PUTC(saved_char_in);
-/******************************************************************
- * I.  LATIN-1 OR UCS2 TO DISPLAY CHARSET
- ******************************************************************/
-	} else if ((chk = (BOOL) (context->T.trans_from_uni &&
-				  TOASCII(unsign_c) >= 160)) &&		/* S/390 -- gil -- 0968 */
-		   (uck = UCTransUniChar(unsign_c,
-					 context->outUCLYhndl)) >= ' ' &&
+	} else if ((chk = (BOOL) (me->T.trans_from_uni &&
+				  TOASCII(clong) >= 160)) &&	/* S/390 -- gil -- 0968 */
+		   (uck = UCTransUniChar(clong,
+					 me->outUCLYhndl)) >= ' ' &&
 		   uck < 256) {
 	    CTRACE((tfp, "UCTransUniChar returned 0x%.2" PRI_UCode_t
 		    ":'%c'.\n",
@@ -2162,13 +2077,13 @@
 	    PUTC(FROMASCII((char) uck));
 	} else if ((chk &&
 		    (uck == -4 ||
-		     (context->T.repl_translated_C0 &&
+		     (me->T.repl_translated_C0 &&
 		      uck > 0 && uck < 32))) &&
 	    /*
 	     * Not found; look for replacement string.  - KW
 	     */
 		   (uck = UCTransUniCharStr(replace_buf, 60, clong,
-					    context->outUCLYhndl,
+					    me->outUCLYhndl,
 					    0) >= 0)) {
 	    /*
 	     * Got a replacement string.  No further tests for validity -
@@ -2179,7 +2094,7 @@
 	    /*
 	     * If we're displaying UTF-8, try that now.  - FM
 	     */
-	} else if (context->T.output_utf8 && PUTUTF8(clong)) {
+	} else if (me->T.output_utf8 && PUTUTF8(clong)) {
 	    ;			/* do nothing more */
 	    /*
 	     * If it's any other (> 160) 8-bit character, and we have not set
@@ -2188,14 +2103,14 @@
 	     * FM
 	     */
 #define IncludesLatin1Enc \
-		(context->outUCLYhndl == LATIN1 || \
-		 (context->outUCI && \
-		  (context->outUCI->enc & (UCT_CP_SUPERSETOF_LAT1))))
+		(me->outUCLYhndl == LATIN1 || \
+		 (me->outUCI && \
+		  (me->outUCI->enc & (UCT_CP_SUPERSETOF_LAT1))))
 
 #define PASSHI8BIT (HTPassEightBitRaw || \
-		    (context->T.do_8bitraw && !context->T.trans_from_uni))
+		    (me->T.do_8bitraw && !me->T.trans_from_uni))
 
-	} else if (unsign_c > 160 && unsign_c < 256 &&
+	} else if (clong > 160 && clong < 256 &&
 		   !(PASSHI8BIT || IS_CJK_TTY) &&
 		   !IncludesLatin1Enc) {
 #ifdef USE_PRETTYSRC
@@ -2203,7 +2118,7 @@
 #endif
 
 	    string->size = 0;
-	    EntityName = HTMLGetEntityName((UCode_t) (unsign_c - 160));
+	    EntityName = HTMLGetEntityName((UCode_t) (clong - 160));
 	    HTChunkPuts(string, EntityName);
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
@@ -2213,7 +2128,7 @@
 		psrc_view = 0;
 	    }
 #endif
-	    handle_entity(context, '\0');
+	    handle_entity(me, '\0');
 #ifdef USE_PRETTYSRC
 	    /* we need to disable it temporarily */
 	    if (psrc_view_backup)
@@ -2227,7 +2142,7 @@
 	     * If we get to here and have an ASCII char, pass the character.  -
 	     * KW
 	     */
-	} else if (TOASCII(unsign_c) < 127 && unsign_c > 0) {	/* S/390 -- gil -- 0987 */
+	} else if (TOASCII(clong) < 127 && clong > 0) {		/* S/390 -- gil -- 0987 */
 	    PUTC(c);
 	    /*
 	     * If we get to here, and should have translated, translation has
@@ -2236,31 +2151,17 @@
 	     * We should have sent UTF-8 output to the parser already, but what
 	     * the heck, try again.  - FM
 	     */
-	} else if (context->T.output_utf8 && *context->utf_buf) {
-	    PUTS(context->utf_buf);
-	    context->utf_buf_p = context->utf_buf;
-	    *(context->utf_buf_p) = '\0';
-#ifdef NOTDEFINED
-	    /*
-	     * Check for a strippable koi8-r 8-bit character.  - FM
-	     */
-	} else if (context->T.strip_raw_char_in && saved_char_in &&
-		   (saved_char_in >= 0xc0) &&
-		   (saved_char_in < 255)) {
-	    /*
-	     * KOI8 special:  strip high bit, gives (somewhat) readable ASCII
-	     * or KOI7 - it was constructed that way!  - KW
-	     */
-	    PUTC((saved_char_in & 0x7f));
-	    saved_char_in = '\0';
-#endif /* NOTDEFINED */
+	} else if (me->T.output_utf8 && *me->U.utf_buf) {
+	    PUTS(me->U.utf_buf);
+	    me->U.utf_buf_p = me->U.utf_buf;
+	    *(me->U.utf_buf_p) = '\0';
 	    /*
 	     * If we don't actually want the character, make it safe and output
 	     * that now.  - FM
 	     */
 	} else if (TOASCII(UCH(c)) <	/* S/390 -- gil -- 0997 */
-		   LYlowest_eightbit[context->outUCLYhndl] ||
-		   (context->T.trans_from_uni && !HTPassEightBitRaw)) {
+		   LYlowest_eightbit[me->outUCLYhndl] ||
+		   (me->T.trans_from_uni && !HTPassEightBitRaw)) {
 	    /*
 	     * If we get to here, pass the character.  - FM
 	     */
@@ -2275,16 +2176,16 @@
 	 * processing instructions.  - kw
 	 */
     case S_pcdata:
-	if (!string->size && TOASCII(unsign_c) < 127) {		/* first after '<' */
+	if (!string->size && TOASCII(clong) < 127) {	/* first after '<' */
 	    if (c == '!') {	/* <! */
 		/*
 		 * Terminate and set up for possible comment, identifier,
 		 * declaration, or marked section as under S_tag.  - kw
 		 */
-		context->state = S_exclamation;
-		context->lead_exclamation = TRUE;
-		context->doctype_bracket = FALSE;
-		context->first_bracket = FALSE;
+		me->state = S_exclamation;
+		me->lead_exclamation = TRUE;
+		me->doctype_bracket = FALSE;
+		me->first_bracket = FALSE;
 		HTChunkPutc(string, c);
 		break;
 	    } else if (c == '?') {	/* <? - ignore as a PI until '>' - kw */
@@ -2297,7 +2198,7 @@
 		    PSRCSTOP(abracket);
 		}
 #endif
-		context->state = S_pi;
+		me->state = S_pi;
 		break;
 	    }
 	}
@@ -2309,16 +2210,16 @@
 	 * a comment by lynx.
 	 */
     case S_script:
-	if (!string->size && TOASCII(unsign_c) < 127) {		/* first after '<' */
+	if (!string->size && TOASCII(clong) < 127) {	/* first after '<' */
 	    if (c == '!') {	/* <! */
 		/*
 		 * Terminate and set up for possible comment, identifier,
 		 * declaration, or marked section as under S_tag.  - kw
 		 */
-		context->state = S_exclamation;
-		context->lead_exclamation = TRUE;
-		context->doctype_bracket = FALSE;
-		context->first_bracket = FALSE;
+		me->state = S_exclamation;
+		me->lead_exclamation = TRUE;
+		me->doctype_bracket = FALSE;
+		me->first_bracket = FALSE;
 		HTChunkPutc(string, c);
 		break;
 	    }
@@ -2336,16 +2237,16 @@
 #ifdef USE_PRETTYSRC
 	if (psrc_view) {
 	    /* there is nothing useful in the element_stack */
-	    testtag = context->current_tag;
+	    testtag = me->current_tag;
 	} else
 #endif
-	    testtag = (context->element_stack
-		       ? context->element_stack->tag
+	    testtag = (me->element_stack
+		       ? me->element_stack->tag
 		       : NULL);
 
 	if (testtag == NULL || testtag->name == NULL) {
 	    string->size--;
-	    context->state = S_text;
+	    me->state = S_text;
 	    goto top1;
 	}
 
@@ -2355,7 +2256,7 @@
 	 *      string contains something like "/title>"
 	 * so we decrement by 2 to compare the final character of each.
 	 */
-	testlast = string->size - 2 - context->trailing_spaces - context->leading_spaces;
+	testlast = string->size - 2 - me->trailing_spaces - me->leading_spaces;
 
 	if (TOUPPER(c) != ((testlast < 0)
 			   ? '/'
@@ -2371,13 +2272,13 @@
 		if (psrc_view) {
 		    char *trailing = NULL;
 
-		    if (context->trailing_spaces) {
+		    if (me->trailing_spaces) {
 			StrAllocCopy(trailing,
 				     string->data
 				     + string->size
 				     - 1
-				     - context->trailing_spaces);
-			trailing[context->trailing_spaces] = '\0';
+				     - me->trailing_spaces);
+			trailing[me->trailing_spaces] = '\0';
 		    }
 
 		    PSRCSTART(abracket);
@@ -2385,8 +2286,8 @@
 		    PSRCSTOP(abracket);
 		    PSRCSTART(tag);
 
-		    strcpy(string->data, context->current_tag->name);
-		    transform_tag(context, string);
+		    strcpy(string->data, me->current_tag->name);
+		    transform_tag(me, string);
 		    PUTS(string->data);
 
 		    if (trailing) {
@@ -2399,16 +2300,16 @@
 		    PUTC('>');
 		    PSRCSTOP(abracket);
 
-		    context->current_tag = NULL;
+		    me->current_tag = NULL;
 		} else
 #endif
-		    end_element(context, context->element_stack->tag);
+		    end_element(me, me->element_stack->tag);
 
 		string->size = 0;
-		context->current_attribute_number = INVALID;
-		context->state = S_text;
-		context->leading_spaces = 0;
-		context->trailing_spaces = 0;
+		me->current_attribute_number = INVALID;
+		me->state = S_text;
+		me->leading_spaces = 0;
+		me->trailing_spaces = 0;
 		break;
 	    }
 
@@ -2418,12 +2319,12 @@
 	     */
 	    if (isspace(UCH(c))) {
 		if (testlast == -1) {
-		    context->leading_spaces += 1;
-		    CTRACE2(TRACE_SGML, (tfp, "leading spaces: %d\n", context->leading_spaces));
+		    me->leading_spaces += 1;
+		    CTRACE2(TRACE_SGML, (tfp, "leading spaces: %d\n", me->leading_spaces));
 		    break;
 		} else if (testlast > 0) {
-		    context->trailing_spaces += 1;
-		    CTRACE2(TRACE_SGML, (tfp, "trailing spaces: %d\n", context->trailing_spaces));
+		    me->trailing_spaces += 1;
+		    CTRACE2(TRACE_SGML, (tfp, "trailing spaces: %d\n", me->trailing_spaces));
 		    break;
 		}
 	    }
@@ -2431,15 +2332,15 @@
 	    /*
 	     * Mismatch - recover.
 	     */
-	    context->leading_spaces = 0;
-	    context->trailing_spaces = 0;
+	    me->leading_spaces = 0;
+	    me->trailing_spaces = 0;
 	    if (((testtag->contents != SGML_LITTERAL &&
 		  (testtag->flags & Tgf_strict)) ||
-		 (context->state == S_pcdata &&
+		 (me->state == S_pcdata &&
 		  (testtag->flags & (Tgf_strict | Tgf_endO)))) &&
 		(testlast > -1 &&
 		 (c == '>' || testlast > 0 || IsNmStart(c)))) {
-		context->state = S_end;
+		me->state = S_end;
 		string->size--;
 		for (i = 0; i < string->size; i++)	/* remove '/' */
 		    string->data[i] = string->data[i + 1];
@@ -2448,10 +2349,10 @@
 		string->size--;
 		goto top1;
 	    }
-	    if (context->state == S_pcdata &&
+	    if (me->state == S_pcdata &&
 		(testtag->flags & (Tgf_strict | Tgf_endO)) &&
 		(testlast < 0 && IsNmStart(c))) {
-		context->state = S_tag;
+		me->state = S_tag;
 		break;
 	    }
 	    /*
@@ -2461,7 +2362,7 @@
 	    for (i = 0; i < string->size - 1; i++)	/* recover, except last c */
 		PUTC(string->data[i]);
 	    string->size = 0;
-	    context->state = S_text;
+	    me->state = S_text;
 	    goto top1;		/* to recover last c */
 	}
 	break;
@@ -2474,17 +2375,17 @@
 	    /*
 	     * Setting up for possible numeric entity.
 	     */
-	    context->state = S_cro;	/* &# is Char Ref Open */
+	    me->state = S_cro;	/* &# is Char Ref Open */
 	    break;
 	}
-	context->state = S_entity;	/* Fall through! */
+	me->state = S_entity;	/* Fall through! */
 
 	/*
 	 * Handle possible named entity.
 	 */
     case S_entity:
-	if (TOASCII(unsign_c) < 127 && (string->size ?	/* S/390 -- gil -- 1029 */
-					isalnum(UCH(c)) : isalpha(UCH(c)))) {
+	if (TOASCII(clong) < 127 && (string->size ?	/* S/390 -- gil -- 1029 */
+				     isalnum(UCH(c)) : isalpha(UCH(c)))) {
 	    /* Should probably use IsNmStart/IsNmChar above (is that right?),
 	       but the world is not ready for that - there's &nbsp: (note
 	       colon!) and stuff around. */
@@ -2506,7 +2407,7 @@
 	    if (psrc_view)
 		PSRCSTOP(badseq);
 #endif
-	    context->state = S_text;
+	    me->state = S_text;
 	    goto top1;
 	} else {
 	    /*
@@ -2519,9 +2420,9 @@
 	    /* S/390 -- gil -- 1039 */
 	    /* CTRACE((tfp, "%s: %d: %s\n", __FILE__, __LINE__, string->data)); */
 	    if (!strcmp(string->data, "zwnj") &&
-		(!context->element_stack ||
-		 (context->element_stack->tag &&
-		  context->element_stack->tag->contents == SGML_MIXED))) {
+		(!me->element_stack ||
+		 (me->element_stack->tag &&
+		  me->element_stack->tag->contents == SGML_MIXED))) {
 		/*
 		 * Handle zwnj (8204) as <WBR>.  - FM
 		 */
@@ -2535,20 +2436,20 @@
 		} else {
 		    sprintf(temp, "<WBR>");
 		}
-		if (context->recover == NULL) {
-		    StrAllocCopy(context->recover, temp);
-		    context->recover_index = 0;
+		if (me->recover == NULL) {
+		    StrAllocCopy(me->recover, temp);
+		    me->recover_index = 0;
 		} else {
-		    StrAllocCat(context->recover, temp);
+		    StrAllocCat(me->recover, temp);
 		}
 		string->size = 0;
-		context->state = S_text;
+		me->state = S_text;
 		break;
 	    } else {
-		handle_entity(context, '\0');
+		handle_entity(me, '\0');
 	    }
 	    string->size = 0;
-	    context->state = S_text;
+	    me->state = S_text;
 	    /*
 	     * Don't eat the terminator if we didn't find the entity name and
 	     * therefore sent the raw string via handle_entity(), or if the
@@ -2570,16 +2471,16 @@
 	 * Check for a numeric entity.
 	 */
     case S_cro:
-	if (TOASCII(unsign_c) < 127 && TOLOWER(UCH(c)) == 'x') {	/* S/390 -- gil -- 1060 */
-	    context->isHex = TRUE;
-	    context->state = S_incro;
-	} else if (TOASCII(unsign_c) < 127 && isdigit(UCH(c))) {
+	if (TOASCII(clong) < 127 && TOLOWER(UCH(c)) == 'x') {	/* S/390 -- gil -- 1060 */
+	    me->isHex = TRUE;
+	    me->state = S_incro;
+	} else if (TOASCII(clong) < 127 && isdigit(UCH(c))) {
 	    /*
 	     * Accept only valid ASCII digits.  - FM
 	     */
 	    HTChunkPutc(string, c);	/* accumulate a character NUMBER */
-	    context->isHex = FALSE;
-	    context->state = S_incro;
+	    me->isHex = FALSE;
+	    me->state = S_incro;
 	} else if (string->size == 0) {
 	    /*
 	     * No 'x' or digit following the "&#" so recover them and recycle
@@ -2595,7 +2496,7 @@
 	    if (psrc_view)
 		PSRCSTOP(badseq);
 #endif
-	    context->state = S_text;
+	    me->state = S_text;
 	    goto top1;
 	}
 	break;
@@ -2605,8 +2506,8 @@
 	 */
     case S_incro:
 	/* S/390 -- gil -- 1075 */
-	if ((TOASCII(unsign_c) < 127) &&
-	    (context->isHex
+	if ((TOASCII(clong) < 127) &&
+	    (me->isHex
 	     ? isxdigit(UCH(c))
 	     : isdigit(UCH(c)))) {
 	    /*
@@ -2627,8 +2528,8 @@
 	    if (psrc_view)
 		PSRCSTOP(badseq);
 #endif
-	    context->isHex = FALSE;
-	    context->state = S_text;
+	    me->isHex = FALSE;
+	    me->state = S_text;
 	    goto top1;
 	} else {
 	    /*
@@ -2641,19 +2542,19 @@
 #ifdef USE_PRETTYSRC
 	    entity_string = string->data;
 #endif
-	    if (UCScanCode(&code, string->data, context->isHex)) {
+	    if (UCScanCode(&code, string->data, me->isHex)) {
 
 /* =============== work in ASCII below here ===============  S/390 -- gil -- 1092 */
-		if (AssumeCP1252(context)) {
+		if (AssumeCP1252(me)) {
 		    code = LYcp1252ToUnicode(code);
 		}
 		/*
 		 * Check for special values.  - FM
 		 */
 		if ((code == 8204) &&
-		    (!context->element_stack ||
-		     (context->element_stack->tag &&
-		      context->element_stack->tag->contents == SGML_MIXED))) {
+		    (!me->element_stack ||
+		     (me->element_stack->tag &&
+		      me->element_stack->tag->contents == SGML_MIXED))) {
 		    /*
 		     * Handle zwnj (8204) as <WBR>.  - FM
 		     */
@@ -2675,17 +2576,17 @@
 		     * Add the replacement string to the recover buffer for
 		     * processing.  - FM
 		     */
-		    if (context->recover == NULL) {
-			StrAllocCopy(context->recover, temp);
-			context->recover_index = 0;
+		    if (me->recover == NULL) {
+			StrAllocCopy(me->recover, temp);
+			me->recover_index = 0;
 		    } else {
-			StrAllocCat(context->recover, temp);
+			StrAllocCat(me->recover, temp);
 		    }
 		    string->size = 0;
-		    context->isHex = FALSE;
-		    context->state = S_text;
+		    me->isHex = FALSE;
+		    me->state = S_text;
 		    break;
-		} else if (put_special_unicodes(context, code)) {
+		} else if (put_special_unicodes(me, code)) {
 		    /*
 		     * We handled the value as a special character, so recycle
 		     * the terminator or break.  - FM
@@ -2693,7 +2594,7 @@
 #ifdef USE_PRETTYSRC
 		    if (psrc_view) {
 			PSRCSTART(entity);
-			PUTS((context->isHex ? "&#x" : "&#"));
+			PUTS((me->isHex ? "&#x" : "&#"));
 			PUTS(entity_string);
 			if (c == ';')
 			    PUTC(';');
@@ -2701,8 +2602,8 @@
 		    }
 #endif
 		    string->size = 0;
-		    context->isHex = FALSE;
-		    context->state = S_text;
+		    me->isHex = FALSE;
+		    me->state = S_text;
 		    if (c != ';')
 			goto top1;
 		    break;
@@ -2711,38 +2612,38 @@
 		 * Seek a translation from the chartrans tables.
 		 */
 		if ((uck = UCTransUniChar(code,
-					  context->outUCLYhndl)) >= 32 &&
+					  me->outUCLYhndl)) >= 32 &&
 		    uck < 256 &&
 		    (uck < 127 ||
-		     uck >= LYlowest_eightbit[context->outUCLYhndl])) {
+		     uck >= LYlowest_eightbit[me->outUCLYhndl])) {
 #ifdef USE_PRETTYSRC
 		    if (!psrc_view) {
 #endif
 			PUTC(FROMASCII((char) uck));
 #ifdef USE_PRETTYSRC
 		    } else {
-			put_pretty_number(context);
+			put_pretty_number(me);
 		    }
 #endif
 		} else if ((uck == -4 ||
-			    (context->T.repl_translated_C0 &&
+			    (me->T.repl_translated_C0 &&
 			     uck > 0 && uck < 32)) &&
 		    /*
 		     * Not found; look for replacement string.
 		     */
 			   (uck = UCTransUniCharStr(replace_buf, 60, code,
-						    context->outUCLYhndl,
+						    me->outUCLYhndl,
 						    0) >= 0)) {
 #ifdef USE_PRETTYSRC
 		    if (psrc_view) {
-			put_pretty_number(context);
+			put_pretty_number(me);
 		    } else
 #endif
 			PUTS(replace_buf);
 		    /*
 		     * If we're displaying UTF-8, try that now.  - FM
 		     */
-		} else if (context->T.output_utf8 && PUTUTF8(code)) {
+		} else if (me->T.output_utf8 && PUTUTF8(code)) {
 		    ;		/* do nothing more */
 		    /*
 		     * Ignore 8205 (zwj), 8206 (lrm), and 8207 (rln), if we get
@@ -2758,13 +2659,13 @@
 				  (string->size < 64 ? string->size : 63));
 			fprintf(tfp,
 				"SGML_character: Ignoring '%s%s'.\n",
-				(context->isHex ? "&#x" : "&#"),
+				(me->isHex ? "&#x" : "&#"),
 				replace_buf);
 		    }
 #ifdef USE_PRETTYSRC
 		    if (psrc_view) {
 			PSRCSTART(badseq);
-			PUTS((context->isHex ? "&#x" : "&#"));
+			PUTS((me->isHex ? "&#x" : "&#"));
 			PUTS(entity_string);
 			if (c == ';')
 			    PUTC(';');
@@ -2772,8 +2673,8 @@
 		    }
 #endif
 		    string->size = 0;
-		    context->isHex = FALSE;
-		    context->state = S_text;
+		    me->isHex = FALSE;
+		    me->state = S_text;
 		    if (c != ';')
 			goto top1;
 		    break;
@@ -2806,9 +2707,9 @@
 			PSRCSTART(badseq);
 		    }
 #endif
-		    if (context->isHex) {
+		    if (me->isHex) {
 			PUTS("&#x");
-			context->isHex = FALSE;
+			me->isHex = FALSE;
 		    } else {
 			PUTS("&#");
 		    }
@@ -2821,8 +2722,8 @@
 		    }
 #endif
 		    string->size = 0;
-		    context->isHex = FALSE;
-		    context->state = S_text;
+		    me->isHex = FALSE;
+		    me->state = S_text;
 		    goto top1;
 		} else if (TOASCII(code) < 161 ||	/* S/390 -- gil -- 1162 */
 			   HTPassEightBitNum ||
@@ -2832,7 +2733,7 @@
 		     */
 #ifdef USE_PRETTYSRC
 		    if (psrc_view) {
-			put_pretty_number(context);
+			put_pretty_number(me);
 		    } else
 #endif
 			PUTC(FROMASCII((char) code));
@@ -2846,7 +2747,7 @@
 			string->size = 0;
 			HTChunkPuts(string, EntityName);
 			HTChunkTerminate(string);
-			handle_entity(context, '\0');
+			handle_entity(me, '\0');
 			/*
 			 * Add a semi-colon if something went wrong and
 			 * handle_entity() sent the string.  - FM
@@ -2863,9 +2764,9 @@
 			if (psrc_view)
 			    PSRCSTART(badseq);
 #endif
-			if (context->isHex) {
+			if (me->isHex) {
 			    PUTS("&#x");
-			    context->isHex = FALSE;
+			    me->isHex = FALSE;
 			} else {
 			    PUTS("&#");
 			}
@@ -2877,8 +2778,8 @@
 			    PSRCSTOP(badseq);
 #endif
 			string->size = 0;
-			context->isHex = FALSE;
-			context->state = S_text;
+			me->isHex = FALSE;
+			me->state = S_text;
 			goto top1;
 		    }
 		}
@@ -2886,8 +2787,8 @@
 		 * If we get to here, we succeeded.  Hoorah!!!  - FM
 		 */
 		string->size = 0;
-		context->isHex = FALSE;
-		context->state = S_text;
+		me->isHex = FALSE;
+		me->state = S_text;
 		/*
 		 * Don't eat the terminator if it's not the "standard"
 		 * semi-colon for HTML.  - FM
@@ -2908,9 +2809,9 @@
 		if (psrc_view)
 		    PSRCSTART(badseq);
 #endif
-		if (context->isHex) {
+		if (me->isHex) {
 		    PUTS("&#x");
-		    context->isHex = FALSE;
+		    me->isHex = FALSE;
 		} else {
 		    PUTS("&#");
 		}
@@ -2918,15 +2819,15 @@
 		if (psrc_view)
 		    PSRCSTOP(badseq);
 #endif
-		if (context->recover == NULL) {
-		    StrAllocCopy(context->recover, string->data);
-		    context->recover_index = 0;
+		if (me->recover == NULL) {
+		    StrAllocCopy(me->recover, string->data);
+		    me->recover_index = 0;
 		} else {
-		    StrAllocCat(context->recover, string->data);
+		    StrAllocCat(me->recover, string->data);
 		}
 		string->size = 0;
-		context->isHex = FALSE;
-		context->state = S_text;
+		me->isHex = FALSE;
+		me->state = S_text;
 		break;
 	    }
 	}
@@ -2936,8 +2837,8 @@
 	 * Tag
 	 */
     case S_tag:		/* new tag */
-	if (TOASCII(unsign_c) < 127 && (string->size ?	/* S/390 -- gil -- 1179 */
-					IsNmChar(c) : IsNmStart(c))) {
+	if (TOASCII(clong) < 127 && (string->size ?	/* S/390 -- gil -- 1179 */
+				     IsNmChar(c) : IsNmStart(c))) {
 	    /*
 	     * Add valid ASCII character.  - FM
 	     */
@@ -2947,14 +2848,14 @@
 	     * Terminate and set up for possible comment, identifier,
 	     * declaration, or marked section.  - FM
 	     */
-	    context->state = S_exclamation;
-	    context->lead_exclamation = TRUE;
-	    context->doctype_bracket = FALSE;
-	    context->first_bracket = FALSE;
+	    me->state = S_exclamation;
+	    me->lead_exclamation = TRUE;
+	    me->doctype_bracket = FALSE;
+	    me->first_bracket = FALSE;
 	    HTChunkPutc(string, c);
 	    break;
 	} else if (!string->size &&
-		   (TOASCII(unsign_c) <= 160 &&		/* S/390 -- gil -- 1196 */
+		   (TOASCII(clong) <= 160 &&	/* S/390 -- gil -- 1196 */
 		    (c != '/' && c != '?' && c != '_' && c != ':'))) {
 	    /*
 	     * '<' must be followed by an ASCII letter to be a valid start tag. 
@@ -2964,7 +2865,7 @@
 	     * other extension.  So recover the '<' and following character as
 	     * data.  - FM & KW
 	     */
-	    context->state = S_text;
+	    me->state = S_text;
 #ifdef USE_PRETTYSRC
 	    if (psrc_view)
 		PSRCSTART(badseq);
@@ -2983,7 +2884,7 @@
 
 	    if (c == '/') {
 		if (string->size == 0) {
-		    context->state = S_end;
+		    me->state = S_end;
 		    break;
 		}
 		CTRACE((tfp, "SGML: `<%.*s/' found!\n", string->size, string->data));
@@ -2991,7 +2892,7 @@
 	    HTChunkTerminate(string);
 
 	    t = SGMLFindTag(dtd, string->data);
-	    if (t == context->unknown_tag &&
+	    if (t == me->unknown_tag &&
 		((c == ':' &&
 		  string->size == 4 && 0 == strcasecomp(string->data, "URL")) ||
 		 (string->size > 4 && 0 == strncasecomp(string->data, "URL:", 4)))) {
@@ -3013,7 +2914,7 @@
 		CTRACE((tfp, "SGML: Treating <%s%c as text\n",
 			string->data, c));
 		string->size = 0;
-		context->state = S_text;
+		me->state = S_text;
 		break;
 	    }
 	    if (c == '/' && t) {
@@ -3023,7 +2924,7 @@
 		 * empty element (if '>' follows directly) or do some
 		 * SGMLshortref-ish treatment.  - kw
 		 */
-		context->slashedtag = t;
+		me->slashedtag = t;
 	    }
 	    if (!t) {
 		if (c == '?' && string->size <= 1) {
@@ -3036,7 +2937,7 @@
 		    }
 #endif
 		    string->size = 0;
-		    context->state = S_pi;
+		    me->state = S_pi;
 		    HTChunkPutc(string, c);
 		    break;
 		}
@@ -3049,7 +2950,7 @@
 		    PUTC('<');
 		    PSRCSTOP(abracket);
 		    PSRCSTART(badtag);
-		    transform_tag(context, string);
+		    transform_tag(me, string);
 		    PUTS(string->data);
 		    if (c == '>') {
 			PSRCSTOP(badtag);
@@ -3061,9 +2962,9 @@
 		    }
 		}
 #endif
-		context->state = (c == '>') ? S_text : S_junk_tag;
+		me->state = (c == '>') ? S_text : S_junk_tag;
 		break;
-	    } else if (t == context->unknown_tag) {
+	    } else if (t == me->unknown_tag) {
 		CTRACE((tfp, "SGML: *** Unknown element \"%s\"\n",
 			string->data));
 		/*
@@ -3072,20 +2973,20 @@
 		 */
 
 	    }
-	    context->current_tag = t;
+	    me->current_tag = t;
 
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
 		PSRCSTART(abracket);
 		PUTC('<');
 		PSRCSTOP(abracket);
-		if (t != context->unknown_tag)
+		if (t != me->unknown_tag)
 		    PSRCSTART(tag);
 		else
 		    PSRCSTART(badtag);
-		transform_tag(context, string);
+		transform_tag(me, string);
 		PUTS(string->data);
-		if (t != context->unknown_tag)
+		if (t != me->unknown_tag)
 		    PSRCSTOP(tag);
 		else
 		    PSRCSTOP(badtag);
@@ -3096,75 +2997,75 @@
 		/*
 		 * Clear out attributes.
 		 */
-		memset((void *) context->present, 0, sizeof(BOOL) *
-		         (unsigned) (context->current_tag->number_of_attributes));
+		memset((void *) me->present, 0, sizeof(BOOL) *
+		         (unsigned) (me->current_tag->number_of_attributes));
 	    }
 
 	    string->size = 0;
-	    context->current_attribute_number = INVALID;
+	    me->current_attribute_number = INVALID;
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		if (c == '>' || c == '<' || (c == '/' && context->slashedtag)) {
+		if (c == '>' || c == '<' || (c == '/' && me->slashedtag)) {
 		    if (c != '<') {
 			PSRCSTART(abracket);
 			PUTC(c);
 			PSRCSTOP(abracket);
-			context->state = (c == '>') ? S_text : S_tagname_slash;
+			me->state = (c == '>') ? S_text : S_tagname_slash;
 		    } else {
-			context->state = S_tag;
+			me->state = S_tag;
 		    }
 		} else {
 		    if (!WHITE(c))
 			PUTC(c);
-		    context->state = S_tag_gap;
+		    me->state = S_tag_gap;
 		}
 	    } else
 #endif
-	    if (c == '>' || c == '<' || (c == '/' && context->slashedtag)) {
-		if (context->current_tag->name)
-		    start_element(context);
-		context->state = (c == '>') ? S_text :
+	    if (c == '>' || c == '<' || (c == '/' && me->slashedtag)) {
+		if (me->current_tag->name)
+		    start_element(me);
+		me->state = (c == '>') ? S_text :
 		    (c == '<') ? S_tag : S_tagname_slash;
 	    } else {
-		context->state = S_tag_gap;
+		me->state = S_tag_gap;
 	    }
 	}
 	break;
 
     case S_exclamation:
-	if (context->lead_exclamation && c == '-') {
+	if (me->lead_exclamation && c == '-') {
 	    /*
 	     * Set up for possible comment.  - FM
 	     */
-	    context->lead_exclamation = FALSE;
-	    context->first_dash = TRUE;
+	    me->lead_exclamation = FALSE;
+	    me->first_dash = TRUE;
 	    HTChunkPutc(string, c);
 	    break;
 	}
-	if (context->lead_exclamation && c == '[') {
+	if (me->lead_exclamation && c == '[') {
 	    /*
 	     * Set up for possible marked section.  - FM
 	     */
-	    context->lead_exclamation = FALSE;
-	    context->first_bracket = TRUE;
-	    context->second_bracket = FALSE;
+	    me->lead_exclamation = FALSE;
+	    me->first_bracket = TRUE;
+	    me->second_bracket = FALSE;
 	    HTChunkPutc(string, c);
-	    context->state = S_marked;
+	    me->state = S_marked;
 	    break;
 	}
-	if (context->first_dash && c == '-') {
+	if (me->first_dash && c == '-') {
 	    /*
 	     * Set up to handle comment.  - FM
 	     */
-	    context->lead_exclamation = FALSE;
-	    context->first_dash = FALSE;
-	    context->end_comment = FALSE;
+	    me->lead_exclamation = FALSE;
+	    me->first_dash = FALSE;
+	    me->end_comment = FALSE;
 	    HTChunkPutc(string, c);
-	    context->state = S_comment;
+	    me->state = S_comment;
 	    break;
 	}
-	context->lead_exclamation = FALSE;
-	context->first_dash = FALSE;
+	me->lead_exclamation = FALSE;
+	me->first_dash = FALSE;
 	if (c == '>') {
 	    /*
 	     * Try to handle identifier.  - FM
@@ -3179,9 +3080,9 @@
 		PSRCSTOP(sgmlspecial);
 	    } else
 #endif
-		handle_identifier(context);
+		handle_identifier(me);
 	    string->size = 0;
-	    context->state = S_text;
+	    me->state = S_text;
 	    break;
 	}
 	if (WHITE(c)) {
@@ -3191,8 +3092,8 @@
 		 * Set up for DOCTYPE declaration.  - FM
 		 */
 		HTChunkPutc(string, c);
-		context->doctype_bracket = FALSE;
-		context->state = S_doctype;
+		me->doctype_bracket = FALSE;
+		me->state = S_doctype;
 		break;
 	    }
 	    if (string->size == 7 &&
@@ -3201,9 +3102,9 @@
 		 * Set up for ENTITY declaration.  - FM
 		 */
 		HTChunkPutc(string, c);
-		context->first_dash = FALSE;
-		context->end_comment = TRUE;
-		context->state = S_sgmlent;
+		me->first_dash = FALSE;
+		me->end_comment = TRUE;
+		me->state = S_sgmlent;
 		break;
 	    }
 	    if (string->size == 8 &&
@@ -3212,9 +3113,9 @@
 		 * Set up for ELEMENT declaration.  - FM
 		 */
 		HTChunkPutc(string, c);
-		context->first_dash = FALSE;
-		context->end_comment = TRUE;
-		context->state = S_sgmlele;
+		me->first_dash = FALSE;
+		me->end_comment = TRUE;
+		me->state = S_sgmlele;
 		break;
 	    }
 	    if (string->size == 8 &&
@@ -3223,9 +3124,9 @@
 		 * Set up for ATTLIST declaration.  - FM
 		 */
 		HTChunkPutc(string, c);
-		context->first_dash = FALSE;
-		context->end_comment = TRUE;
-		context->state = S_sgmlatt;
+		me->first_dash = FALSE;
+		me->end_comment = TRUE;
+		me->state = S_sgmlatt;
 		break;
 	    }
 	}
@@ -3248,34 +3149,34 @@
 		    PSRCSTOP(comm);
 		} else
 #endif
-		    handle_comment(context);
+		    handle_comment(me);
 		string->size = 0;
-		context->end_comment = FALSE;
-		context->first_dash = FALSE;
-		context->state = S_text;
+		me->end_comment = FALSE;
+		me->first_dash = FALSE;
+		me->state = S_text;
 		break;
 	    }
 	    goto S_comment_put_c;
 	}
-	if (!context->first_dash && c == '-') {
+	if (!me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = TRUE;
+	    me->first_dash = TRUE;
 	    break;
 	}
-	if (context->first_dash && c == '-') {
+	if (me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = FALSE;
-	    if (!context->end_comment)
-		context->end_comment = TRUE;
+	    me->first_dash = FALSE;
+	    if (!me->end_comment)
+		me->end_comment = TRUE;
 	    else if (!minimal_comments)
 		/*
 		 * Validly treat '--' pairs as successive comments (for
 		 * minimal, any "--WHITE>" terminates).  - FM
 		 */
-		context->end_comment = FALSE;
+		me->end_comment = FALSE;
 	    break;
 	}
-	if (context->end_comment && c == '>') {
+	if (me->end_comment && c == '>') {
 	    /*
 	     * Terminate and handle the comment.  - FM
 	     */
@@ -3289,36 +3190,36 @@
 		PSRCSTOP(comm);
 	    } else
 #endif
-		handle_comment(context);
+		handle_comment(me);
 	    string->size = 0;
-	    context->end_comment = FALSE;
-	    context->first_dash = FALSE;
-	    context->state = S_text;
+	    me->end_comment = FALSE;
+	    me->first_dash = FALSE;
+	    me->state = S_text;
 	    break;
 	}
-	context->first_dash = FALSE;
-	if (context->end_comment && !isspace(UCH(c)))
-	    context->end_comment = FALSE;
+	me->first_dash = FALSE;
+	if (me->end_comment && !isspace(UCH(c)))
+	    me->end_comment = FALSE;
 
       S_comment_put_c:
-	if (context->T.decode_utf8 &&
-	    *context->utf_buf) {
-	    HTChunkPuts(string, context->utf_buf);
-	    context->utf_buf_p = context->utf_buf;
-	    *(context->utf_buf_p) = '\0';
+	if (me->T.decode_utf8 &&
+	    *me->U.utf_buf) {
+	    HTChunkPuts(string, me->U.utf_buf);
+	    me->U.utf_buf_p = me->U.utf_buf;
+	    *(me->U.utf_buf_p) = '\0';
 	} else if (!IS_CJK_TTY &&
-		   (context->T.output_utf8 ||
-		    context->T.trans_from_uni)) {
-	    if (clong == 0xfffd && saved_char_in &&
+		   (me->T.output_utf8 ||
+		    me->T.trans_from_uni)) {
+	    if (clong == UCS_REPL && saved_char_in &&
 		HTPassEightBitRaw &&
 		saved_char_in >=
-		LYlowest_eightbit[context->outUCLYhndl]) {
+		LYlowest_eightbit[me->outUCLYhndl]) {
 		HTChunkPutUtf8Char(string,
 				   (UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
-	} else if (saved_char_in && context->T.use_raw_char_in) {
+	} else if (saved_char_in && me->T.use_raw_char_in) {
 	    HTChunkPutc(string, saved_char_in);
 	} else {
 	    HTChunkPutc(string, c);
@@ -3326,15 +3227,15 @@
 	break;
 
     case S_doctype:		/* Expecting DOCTYPE. - FM */
-	if (context->doctype_bracket) {
+	if (me->doctype_bracket) {
 	    HTChunkPutc(string, c);
 	    if (c == ']')
-		context->doctype_bracket = FALSE;
+		me->doctype_bracket = FALSE;
 	    break;
 	}
 	if (c == '[' && WHITE(string->data[string->size - 1])) {
 	    HTChunkPutc(string, c);
-	    context->doctype_bracket = TRUE;
+	    me->doctype_bracket = TRUE;
 	    break;
 	}
 	if (c == '>') {
@@ -3348,28 +3249,28 @@
 		PSRCSTOP(sgmlspecial);
 	    } else
 #endif
-		handle_doctype(context);
+		handle_doctype(me);
 	    string->size = 0;
-	    context->state = S_text;
+	    me->state = S_text;
 	    break;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_marked:		/* Expecting marked section. - FM */
-	if (context->first_bracket && c == '[') {
+	if (me->first_bracket && c == '[') {
 	    HTChunkPutc(string, c);
-	    context->first_bracket = FALSE;
-	    context->second_bracket = TRUE;
+	    me->first_bracket = FALSE;
+	    me->second_bracket = TRUE;
 	    break;
 	}
-	if (context->second_bracket && c == ']' &&
+	if (me->second_bracket && c == ']' &&
 	    string->data[string->size - 1] == ']') {
 	    HTChunkPutc(string, c);
-	    context->second_bracket = FALSE;
+	    me->second_bracket = FALSE;
 	    break;
 	}
-	if (!context->second_bracket && c == '>') {
+	if (!me->second_bracket && c == '>') {
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
@@ -3380,30 +3281,30 @@
 		PSRCSTOP(sgmlspecial);
 	    } else
 #endif
-		handle_marked(context);
+		handle_marked(me);
 	    string->size = 0;
-	    context->state = S_text;
+	    me->state = S_text;
 	    break;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_sgmlent:		/* Expecting ENTITY. - FM */
-	if (!context->first_dash && c == '-') {
+	if (!me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = TRUE;
+	    me->first_dash = TRUE;
 	    break;
 	}
-	if (context->first_dash && c == '-') {
+	if (me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = FALSE;
-	    if (!context->end_comment)
-		context->end_comment = TRUE;
+	    me->first_dash = FALSE;
+	    if (!me->end_comment)
+		me->end_comment = TRUE;
 	    else
-		context->end_comment = FALSE;
+		me->end_comment = FALSE;
 	    break;
 	}
-	if (context->end_comment && c == '>') {
+	if (me->end_comment && c == '>') {
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
@@ -3414,33 +3315,33 @@
 		PSRCSTOP(sgmlspecial);
 	    } else
 #endif
-		handle_sgmlent(context);
+		handle_sgmlent(me);
 	    string->size = 0;
-	    context->end_comment = FALSE;
-	    context->first_dash = FALSE;
-	    context->state = S_text;
+	    me->end_comment = FALSE;
+	    me->first_dash = FALSE;
+	    me->state = S_text;
 	    break;
 	}
-	context->first_dash = FALSE;
+	me->first_dash = FALSE;
 	HTChunkPutc(string, c);
 	break;
 
     case S_sgmlele:		/* Expecting ELEMENT. - FM */
-	if (!context->first_dash && c == '-') {
+	if (!me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = TRUE;
+	    me->first_dash = TRUE;
 	    break;
 	}
-	if (context->first_dash && c == '-') {
+	if (me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = FALSE;
-	    if (!context->end_comment)
-		context->end_comment = TRUE;
+	    me->first_dash = FALSE;
+	    if (!me->end_comment)
+		me->end_comment = TRUE;
 	    else
-		context->end_comment = FALSE;
+		me->end_comment = FALSE;
 	    break;
 	}
-	if (context->end_comment && c == '>') {
+	if (me->end_comment && c == '>') {
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
@@ -3451,33 +3352,33 @@
 		PSRCSTOP(sgmlspecial);
 	    } else
 #endif
-		handle_sgmlele(context);
+		handle_sgmlele(me);
 	    string->size = 0;
-	    context->end_comment = FALSE;
-	    context->first_dash = FALSE;
-	    context->state = S_text;
+	    me->end_comment = FALSE;
+	    me->first_dash = FALSE;
+	    me->state = S_text;
 	    break;
 	}
-	context->first_dash = FALSE;
+	me->first_dash = FALSE;
 	HTChunkPutc(string, c);
 	break;
 
     case S_sgmlatt:		/* Expecting ATTLIST. - FM */
-	if (!context->first_dash && c == '-') {
+	if (!me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = TRUE;
+	    me->first_dash = TRUE;
 	    break;
 	}
-	if (context->first_dash && c == '-') {
+	if (me->first_dash && c == '-') {
 	    HTChunkPutc(string, c);
-	    context->first_dash = FALSE;
-	    if (!context->end_comment)
-		context->end_comment = TRUE;
+	    me->first_dash = FALSE;
+	    if (!me->end_comment)
+		me->end_comment = TRUE;
 	    else
-		context->end_comment = FALSE;
+		me->end_comment = FALSE;
 	    break;
 	}
-	if (context->end_comment && c == '>') {
+	if (me->end_comment && c == '>') {
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
@@ -3488,14 +3389,14 @@
 		PSRCSTOP(sgmlspecial);
 	    } else
 #endif
-		handle_sgmlatt(context);
+		handle_sgmlatt(me);
 	    string->size = 0;
-	    context->end_comment = FALSE;
-	    context->first_dash = FALSE;
-	    context->state = S_text;
+	    me->end_comment = FALSE;
+	    me->first_dash = FALSE;
+	    me->state = S_text;
 	    break;
 	}
-	context->first_dash = FALSE;
+	me->first_dash = FALSE;
 	HTChunkPutc(string, c);
 	break;
 
@@ -3508,8 +3409,8 @@
 #ifdef USE_PRETTYSRC
 	    if (!psrc_view)
 #endif
-		if (context->current_tag->name)
-		    start_element(context);
+		if (me->current_tag->name)
+		    start_element(me);
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
 		PSRCSTART(abracket);
@@ -3517,11 +3418,11 @@
 		PSRCSTOP(abracket);
 	    }
 #endif
-	    context->state = S_text;
+	    me->state = S_text;
 	    break;
 	}
 	HTChunkPutc(string, c);
-	context->state = S_attr;	/* Get attribute */
+	me->state = S_attr;	/* Get attribute */
 	break;
 
 	/* accumulating value */
@@ -3530,28 +3431,28 @@
 	    if ((c == '>')
 		&& (string->size == 1)
 		&& (string->data[0] == '/')) {
-		if (context->extended_html
-		    && ignore_when_empty(context->current_tag)) {
-		    discard_empty(context);
+		if (me->extended_html
+		    && ignore_when_empty(me->current_tag)) {
+		    discard_empty(me);
 		}
 	    } else {
 		HTChunkTerminate(string);
-		handle_attribute_name(context, string->data);
+		handle_attribute_name(me, string->data);
 	    }
 #ifdef USE_PRETTYSRC
 	    if (!psrc_view) {
 #endif
 		string->size = 0;
 		if (c == '>') {	/* End of tag */
-		    if (context->current_tag->name)
-			start_element(context);
-		    context->state = S_text;
+		    if (me->current_tag->name)
+			start_element(me);
+		    me->state = S_text;
 		    break;
 		}
 #ifdef USE_PRETTYSRC
 	    } else {
 		PUTC(' ');
-		if (context->current_attribute_number == INVALID)
+		if (me->current_attribute_number == INVALID)
 		    PSRCSTART(badattr);
 		else
 		    PSRCSTART(attrib);
@@ -3565,7 +3466,7 @@
 		if (c == '=' || WHITE(c))
 		    PUTC(c);
 		if (c == '=' || c == '>') {
-		    if (context->current_attribute_number == INVALID) {
+		    if (me->current_attribute_number == INVALID) {
 			PSRCSTOP(badattr);
 		    } else {
 			PSRCSTOP(attrib);
@@ -3575,13 +3476,13 @@
 		    PSRCSTART(abracket);
 		    PUTC('>');
 		    PSRCSTOP(abracket);
-		    context->state = S_text;
+		    me->state = S_text;
 		    break;
 		}
 		string->size = 0;
 	    }
 #endif
-	    context->state = (c == '=' ? S_equals : S_attr_gap);
+	    me->state = (c == '=' ? S_equals : S_attr_gap);
 	} else {
 	    HTChunkPutc(string, c);
 	}
@@ -3595,7 +3496,7 @@
 	if (c == '>') {		/* End of tag */
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		if (context->current_attribute_number == INVALID) {
+		if (me->current_attribute_number == INVALID) {
 		    PSRCSTOP(badattr);
 		} else {
 		    PSRCSTOP(attrib);
@@ -3605,26 +3506,26 @@
 		PSRCSTOP(abracket);
 	    } else
 #endif
-	    if (context->current_tag->name)
-		start_element(context);
-	    context->state = S_text;
+	    if (me->current_tag->name)
+		start_element(me);
+	    me->state = S_text;
 	    break;
 	} else if (c == '=') {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
 		PUTC('=');
-		if (context->current_attribute_number == INVALID) {
+		if (me->current_attribute_number == INVALID) {
 		    PSRCSTOP(badattr);
 		} else {
 		    PSRCSTOP(attrib);
 		}
 	    }
 #endif
-	    context->state = S_equals;
+	    me->state = S_equals;
 	    break;
 	}
 	HTChunkPutc(string, c);
-	context->state = S_attr;	/* Get next attribute */
+	me->state = S_attr;	/* Get next attribute */
 	break;
 
     case S_equals:		/* After attr = */
@@ -3641,9 +3542,9 @@
 		PSRCSTOP(abracket);
 	    } else
 #endif
-	    if (context->current_tag->name)
-		start_element(context);
-	    context->state = S_text;
+	    if (me->current_tag->name)
+		start_element(me);
+	    me->state = S_text;
 	    break;
 
 	} else if (c == '\'') {
@@ -3653,7 +3554,7 @@
 		PUTC(c);
 	    }
 #endif
-	    context->state = S_squoted;
+	    me->state = S_squoted;
 	    break;
 
 	} else if (c == '"') {
@@ -3663,21 +3564,21 @@
 		PUTC(c);
 	    }
 #endif
-	    context->state = S_dquoted;
+	    me->state = S_dquoted;
 	    break;
 	}
 #ifdef USE_PRETTYSRC
 	if (psrc_view)
 	    PSRCSTART(attrval);
 #endif
-	context->state = S_value;
+	me->state = S_value;
 	/*  no break!  fall through to S_value and process current `c`   */
 
     case S_value:
 	if (WHITE(c) || (c == '>')) {	/* End of word */
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
-	    if (!end_if_prettysrc(context, string, 0))
+	    if (!end_if_prettysrc(me, string, 0))
 #endif
 	    {
 #ifdef CJK_EX			/* Quick hack. - JH7AYN */
@@ -3694,7 +3595,7 @@
 		    }
 		}
 #endif
-		handle_attribute_value(context, string->data);
+		handle_attribute_value(me, string->data);
 	    }
 	    string->size = 0;
 	    if (c == '>') {	/* End of tag */
@@ -3705,30 +3606,30 @@
 		    PSRCSTOP(abracket);
 		} else
 #endif
-		if (context->current_tag->name)
-		    start_element(context);
-		context->state = S_text;
+		if (me->current_tag->name)
+		    start_element(me);
+		me->state = S_text;
 		break;
 	    } else
-		context->state = S_tag_gap;
-	} else if (context->T.decode_utf8 &&
-		   *context->utf_buf) {
-	    HTChunkPuts(string, context->utf_buf);
-	    context->utf_buf_p = context->utf_buf;
-	    *(context->utf_buf_p) = '\0';
+		me->state = S_tag_gap;
+	} else if (me->T.decode_utf8 &&
+		   *me->U.utf_buf) {
+	    HTChunkPuts(string, me->U.utf_buf);
+	    me->U.utf_buf_p = me->U.utf_buf;
+	    *(me->U.utf_buf_p) = '\0';
 	} else if (!IS_CJK_TTY &&
-		   (context->T.output_utf8 ||
-		    context->T.trans_from_uni)) {
-	    if (clong == 0xfffd && saved_char_in &&
+		   (me->T.output_utf8 ||
+		    me->T.trans_from_uni)) {
+	    if (clong == UCS_REPL && saved_char_in &&
 		HTPassEightBitRaw &&
 		saved_char_in >=
-		LYlowest_eightbit[context->outUCLYhndl]) {
+		LYlowest_eightbit[me->outUCLYhndl]) {
 		HTChunkPutUtf8Char(string,
 				   (UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
-	} else if (saved_char_in && context->T.use_raw_char_in) {
+	} else if (saved_char_in && me->T.use_raw_char_in) {
 	    HTChunkPutc(string, saved_char_in);
 	} else {
 	    HTChunkPutc(string, c);
@@ -3739,36 +3640,36 @@
 	if (c == '\'') {	/* End of attribute value */
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
-	    if (!end_if_prettysrc(context, string, '\''))
+	    if (!end_if_prettysrc(me, string, '\''))
 #endif
-		handle_attribute_value(context, string->data);
+		handle_attribute_value(me, string->data);
 	    string->size = 0;
-	    context->state = S_tag_gap;
+	    me->state = S_tag_gap;
 	} else if (TOASCII(c) == '\033') {	/* S/390 -- gil -- 1213 */
 	    /*
 	     * Setting up for possible single quotes in CJK escape sequences. 
 	     * - Takuya ASADA (asada@three-a.co.jp)
 	     */
-	    context->state = S_esc_sq;
+	    me->state = S_esc_sq;
 	    HTChunkPutc(string, c);
-	} else if (context->T.decode_utf8 &&
-		   *context->utf_buf) {
-	    HTChunkPuts(string, context->utf_buf);
-	    context->utf_buf_p = context->utf_buf;
-	    *(context->utf_buf_p) = '\0';
+	} else if (me->T.decode_utf8 &&
+		   *me->U.utf_buf) {
+	    HTChunkPuts(string, me->U.utf_buf);
+	    me->U.utf_buf_p = me->U.utf_buf;
+	    *(me->U.utf_buf_p) = '\0';
 	} else if (!IS_CJK_TTY &&
-		   (context->T.output_utf8 ||
-		    context->T.trans_from_uni)) {
-	    if (clong == 0xfffd && saved_char_in &&
+		   (me->T.output_utf8 ||
+		    me->T.trans_from_uni)) {
+	    if (clong == UCS_REPL && saved_char_in &&
 		HTPassEightBitRaw &&
 		saved_char_in >=
-		LYlowest_eightbit[context->outUCLYhndl]) {
+		LYlowest_eightbit[me->outUCLYhndl]) {
 		HTChunkPutUtf8Char(string,
 				   (UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
-	} else if (saved_char_in && context->T.use_raw_char_in) {
+	} else if (saved_char_in && me->T.use_raw_char_in) {
 	    HTChunkPutc(string, saved_char_in);
 	} else {
 	    HTChunkPutc(string, c);
@@ -3781,11 +3682,11 @@
 	     c == '>')) {	/*  as a co-terminator of dquoted and tag    */
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
-	    if (!end_if_prettysrc(context, string, (char) c))
+	    if (!end_if_prettysrc(me, string, (char) c))
 #endif
-		handle_attribute_value(context, string->data);
+		handle_attribute_value(me, string->data);
 	    string->size = 0;
-	    context->state = S_tag_gap;
+	    me->state = S_tag_gap;
 	    if (c == '>')	/* We emulated the Netscape bug, so we go  */
 		goto top1;	/* back and treat it as the tag terminator */
 	} else if (TOASCII(c) == '\033') {	/* S/390 -- gil -- 1230 */
@@ -3793,26 +3694,26 @@
 	     * Setting up for possible double quotes in CJK escape sequences. 
 	     * - Takuya ASADA (asada@three-a.co.jp)
 	     */
-	    context->state = S_esc_dq;
+	    me->state = S_esc_dq;
 	    HTChunkPutc(string, c);
-	} else if (context->T.decode_utf8 &&
-		   *context->utf_buf) {
-	    HTChunkPuts(string, context->utf_buf);
-	    context->utf_buf_p = context->utf_buf;
-	    *(context->utf_buf_p) = '\0';
+	} else if (me->T.decode_utf8 &&
+		   *me->U.utf_buf) {
+	    HTChunkPuts(string, me->U.utf_buf);
+	    me->U.utf_buf_p = me->U.utf_buf;
+	    *(me->U.utf_buf_p) = '\0';
 	} else if (!IS_CJK_TTY &&
-		   (context->T.output_utf8 ||
-		    context->T.trans_from_uni)) {
-	    if (clong == 0xfffd && saved_char_in &&
+		   (me->T.output_utf8 ||
+		    me->T.trans_from_uni)) {
+	    if (clong == UCS_REPL && saved_char_in &&
 		HTPassEightBitRaw &&
 		saved_char_in >=
-		LYlowest_eightbit[context->outUCLYhndl]) {
+		LYlowest_eightbit[me->outUCLYhndl]) {
 		HTChunkPutUtf8Char(string,
 				   (UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
-	} else if (saved_char_in && context->T.use_raw_char_in) {
+	} else if (saved_char_in && me->T.use_raw_char_in) {
 	    HTChunkPutc(string, saved_char_in);
 	} else {
 	    HTChunkPutc(string, c);
@@ -3820,8 +3721,8 @@
 	break;
 
     case S_end:		/* </ */
-	if (TOASCII(unsign_c) < 127 && (string->size ?	/* S/390 -- gil -- 1247 */
-					IsNmChar(c) : IsNmStart(c))) {
+	if (TOASCII(clong) < 127 && (string->size ?	/* S/390 -- gil -- 1247 */
+				     IsNmChar(c) : IsNmStart(c))) {
 	    HTChunkPutc(string, c);
 	} else {		/* End of end tag name */
 	    HTTag *t = 0;
@@ -3832,12 +3733,12 @@
 
 	    HTChunkTerminate(string);
 	    if (!*string->data) {	/* Empty end tag */
-		if (context->element_stack)
-		    t = context->element_stack->tag;
+		if (me->element_stack)
+		    t = me->element_stack->tag;
 	    } else {
 		t = SGMLFindTag(dtd, string->data);
 	    }
-	    if (!t || t == context->unknown_tag) {
+	    if (!t || t == me->unknown_tag) {
 		CTRACE((tfp, "Unknown end tag </%s>\n", string->data));
 #ifdef USE_PRETTYSRC
 		if (psrc_view) {
@@ -3845,7 +3746,7 @@
 		    PUTS("</");
 		    PSRCSTOP(abracket);
 		    PSRCSTART(badtag);
-		    transform_tag(context, string);
+		    transform_tag(me, string);
 		    PUTS(string->data);
 		    if (c != '>') {
 			PUTC(c);
@@ -3864,11 +3765,11 @@
 		HTMLElement e = TAGNUM_OF_TAGP(t);
 		int branch = 2;	/* it can be 0,1,2 */
 
-		context->current_tag = t;
+		me->current_tag = t;
 		if (HAS_ALT_TAGNUM(TAGNUM_OF_TAGP(t)) &&
-		    context->element_stack &&
-		    ALT_TAGP(t) == context->element_stack->tag)
-		    context->element_stack->tag = NORMAL_TAGP(context->element_stack->tag);
+		    me->element_stack &&
+		    ALT_TAGP(t) == me->element_stack->tag)
+		    me->element_stack->tag = NORMAL_TAGP(me->element_stack->tag);
 
 		if (tag_OK && Old_DTD) {
 		    switch (e) {
@@ -3909,7 +3810,7 @@
 		 * Just handle ALL end tags normally :-) - kw
 		 */
 		if (!Old_DTD) {
-		    end_element(context, context->current_tag);
+		    end_element(me, me->current_tag);
 		} else if (tag_OK && (branch == 0)) {
 		    /*
 		     * Don't treat these end tags as invalid, nor act on them. 
@@ -3918,12 +3819,12 @@
 		    CTRACE((tfp, "SGML: `</%s%c' found!  Ignoring it.\n",
 			    string->data, c));
 		    string->size = 0;
-		    context->current_attribute_number = INVALID;
+		    me->current_attribute_number = INVALID;
 		    if (c != '>') {
-			context->state = S_junk_tag;
+			me->state = S_junk_tag;
 		    } else {
-			context->current_tag = NULL;
-			context->state = S_text;
+			me->current_tag = NULL;
+			me->state = S_text;
 		    }
 		    break;
 		} else if (tag_OK && (branch == 1)) {
@@ -3934,7 +3835,7 @@
 		     * checks there to avoid throwing the HTML.c stack out of
 		     * whack (Ugh, what a hack!  8-).  - FM
 		     */
-		    if (context->inSELECT) {
+		    if (me->inSELECT) {
 			/*
 			 * We are in a SELECT block.  - FM
 			 */
@@ -3953,17 +3854,17 @@
 			    CTRACE((tfp,
 				    "SGML: ***Faking SELECT end tag before </%s> end tag.\n",
 				    string->data));
-			    end_element(context,
-					SGMLFindTag(context->dtd, "SELECT"));
+			    end_element(me,
+					SGMLFindTag(me->dtd, "SELECT"));
 			    CTRACE((tfp, "SGML: End </%s>\n", string->data));
 
 #ifdef USE_PRETTYSRC
 			    if (!psrc_view)	/* Don't actually call if viewing psrc - kw */
 #endif
-				(*context->actions->end_element)
-				    (context->target,
-				     (int) TAGNUM_OF_TAGP(context->current_tag),
-				     &context->include);
+				(*me->actions->end_element)
+				    (me->target,
+				     (int) TAGNUM_OF_TAGP(me->current_tag),
+				     &me->include);
 			}
 		    } else if (!strcasecomp(string->data, "P")) {
 			/*
@@ -3977,38 +3878,38 @@
 			    int i;
 
 			    for (i = 0;
-				 i < context->current_tag->number_of_attributes;
+				 i < me->current_tag->number_of_attributes;
 				 i++) {
-				context->present[i] = NO;
+				me->present[i] = NO;
 			    }
 			}
-			if (context->current_tag->name)
-			    start_element(context);
+			if (me->current_tag->name)
+			    start_element(me);
 		    } else {
 			CTRACE((tfp, "SGML: End </%s>\n", string->data));
 
 #ifdef USE_PRETTYSRC
 			if (!psrc_view)		/* Don't actually call if viewing psrc - kw */
 #endif
-			    (*context->actions->end_element)
-				(context->target,
-				 (int) TAGNUM_OF_TAGP(context->current_tag),
-				 &context->include);
+			    (*me->actions->end_element)
+				(me->target,
+				 (int) TAGNUM_OF_TAGP(me->current_tag),
+				 &me->include);
 		    }
 		    string->size = 0;
-		    context->current_attribute_number = INVALID;
+		    me->current_attribute_number = INVALID;
 		    if (c != '>') {
-			context->state = S_junk_tag;
+			me->state = S_junk_tag;
 		    } else {
-			context->current_tag = NULL;
-			context->state = S_text;
+			me->current_tag = NULL;
+			me->state = S_text;
 		    }
 		    break;
 		} else {
 		    /*
 		     * Handle all other end tags normally.  - FM
 		     */
-		    end_element(context, context->current_tag);
+		    end_element(me, me->current_tag);
 		}
 	    }
 
@@ -4038,157 +3939,157 @@
 #endif
 
 	    string->size = 0;
-	    context->current_attribute_number = INVALID;
+	    me->current_attribute_number = INVALID;
 	    if (c != '>') {
 		if (!WHITE(c))
 		    CTRACE((tfp, "SGML: `</%s%c' found!\n", string->data, c));
-		context->state = S_junk_tag;
+		me->state = S_junk_tag;
 	    } else {
-		context->current_tag = NULL;
-		context->state = S_text;
+		me->current_tag = NULL;
+		me->state = S_text;
 	    }
 	}
 	break;
 
     case S_esc:		/* Expecting '$'or '(' following CJK ESC. */
 	if (c == '$') {
-	    context->state = S_dollar;
+	    me->state = S_dollar;
 	} else if (c == '(') {
-	    context->state = S_paren;
+	    me->state = S_paren;
 	} else {
-	    context->state = S_text;
+	    me->state = S_text;
 	}
 	PUTC(c);
 	break;
 
     case S_dollar:		/* Expecting '@', 'B', 'A' or '(' after CJK "ESC$". */
 	if (c == '@' || c == 'B' || c == 'A') {
-	    context->state = S_nonascii_text;
+	    me->state = S_nonascii_text;
 	} else if (c == '(') {
-	    context->state = S_dollar_paren;
+	    me->state = S_dollar_paren;
 	}
 	PUTC(c);
 	break;
 
     case S_dollar_paren:	/* Expecting 'C' after CJK "ESC$(". */
 	if (c == 'C') {
-	    context->state = S_nonascii_text;
+	    me->state = S_nonascii_text;
 	} else {
-	    context->state = S_text;
+	    me->state = S_text;
 	}
 	PUTC(c);
 	break;
 
     case S_paren:		/* Expecting 'B', 'J', 'T' or 'I' after CJK "ESC(". */
 	if (c == 'B' || c == 'J' || c == 'T') {
-	    context->state = S_text;
+	    me->state = S_text;
 	} else if (c == 'I') {
-	    context->state = S_nonascii_text;
+	    me->state = S_nonascii_text;
 	} else {
-	    context->state = S_text;
+	    me->state = S_text;
 	}
 	PUTC(c);
 	break;
 
     case S_nonascii_text:	/* Expecting CJK ESC after non-ASCII text. */
 	if (TOASCII(c) == '\033') {	/* S/390 -- gil -- 1264 */
-	    context->state = S_esc;
+	    me->state = S_esc;
 	}
 	PUTC(c);
 	if (c < 32)
-	    context->state = S_text;
+	    me->state = S_text;
 	break;
 
     case S_esc_sq:		/* Expecting '$'or '(' following CJK ESC. */
 	if (c == '$') {
-	    context->state = S_dollar_sq;
+	    me->state = S_dollar_sq;
 	} else if (c == '(') {
-	    context->state = S_paren_sq;
+	    me->state = S_paren_sq;
 	} else {
-	    context->state = S_squoted;
+	    me->state = S_squoted;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_dollar_sq:		/* Expecting '@', 'B', 'A' or '(' after CJK "ESC$". */
 	if (c == '@' || c == 'B' || c == 'A') {
-	    context->state = S_nonascii_text_sq;
+	    me->state = S_nonascii_text_sq;
 	} else if (c == '(') {
-	    context->state = S_dollar_paren_sq;
+	    me->state = S_dollar_paren_sq;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_dollar_paren_sq:	/* Expecting 'C' after CJK "ESC$(". */
 	if (c == 'C') {
-	    context->state = S_nonascii_text_sq;
+	    me->state = S_nonascii_text_sq;
 	} else {
-	    context->state = S_squoted;
+	    me->state = S_squoted;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_paren_sq:		/* Expecting 'B', 'J', 'T' or 'I' after CJK "ESC(". */
 	if (c == 'B' || c == 'J' || c == 'T') {
-	    context->state = S_squoted;
+	    me->state = S_squoted;
 	} else if (c == 'I') {
-	    context->state = S_nonascii_text_sq;
+	    me->state = S_nonascii_text_sq;
 	} else {
-	    context->state = S_squoted;
+	    me->state = S_squoted;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_nonascii_text_sq:	/* Expecting CJK ESC after non-ASCII text. */
 	if (TOASCII(c) == '\033') {	/* S/390 -- gil -- 1281 */
-	    context->state = S_esc_sq;
+	    me->state = S_esc_sq;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_esc_dq:		/* Expecting '$'or '(' following CJK ESC. */
 	if (c == '$') {
-	    context->state = S_dollar_dq;
+	    me->state = S_dollar_dq;
 	} else if (c == '(') {
-	    context->state = S_paren_dq;
+	    me->state = S_paren_dq;
 	} else {
-	    context->state = S_dquoted;
+	    me->state = S_dquoted;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_dollar_dq:		/* Expecting '@', 'B', 'A' or '(' after CJK "ESC$". */
 	if (c == '@' || c == 'B' || c == 'A') {
-	    context->state = S_nonascii_text_dq;
+	    me->state = S_nonascii_text_dq;
 	} else if (c == '(') {
-	    context->state = S_dollar_paren_dq;
+	    me->state = S_dollar_paren_dq;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_dollar_paren_dq:	/* Expecting 'C' after CJK "ESC$(". */
 	if (c == 'C') {
-	    context->state = S_nonascii_text_dq;
+	    me->state = S_nonascii_text_dq;
 	} else {
-	    context->state = S_dquoted;
+	    me->state = S_dquoted;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_paren_dq:		/* Expecting 'B', 'J', 'T' or 'I' after CJK "ESC(". */
 	if (c == 'B' || c == 'J' || c == 'T') {
-	    context->state = S_dquoted;
+	    me->state = S_dquoted;
 	} else if (c == 'I') {
-	    context->state = S_nonascii_text_dq;
+	    me->state = S_nonascii_text_dq;
 	} else {
-	    context->state = S_dquoted;
+	    me->state = S_dquoted;
 	}
 	HTChunkPutc(string, c);
 	break;
 
     case S_nonascii_text_dq:	/* Expecting CJK ESC after non-ASCII text. */
 	if (TOASCII(c) == '\033') {	/* S/390 -- gil -- 1298 */
-	    context->state = S_esc_dq;
+	    me->state = S_esc_dq;
 	}
 	HTChunkPutc(string, c);
 	break;
@@ -4199,7 +4100,7 @@
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		if (context->state == S_junk_tag) {
+		if (me->state == S_junk_tag) {
 		    PSRCSTOP(badtag);
 		}
 		PSRCSTART(abracket);
@@ -4207,11 +4108,11 @@
 		PSRCSTOP(abracket);
 	    }
 #endif
-	    if (context->state == S_pi)
-		handle_processing_instruction(context);
+	    if (me->state == S_pi)
+		handle_processing_instruction(me);
 	    string->size = 0;
-	    context->current_tag = NULL;
-	    context->state = S_text;
+	    me->current_tag = NULL;
+	    me->state = S_text;
 	} else {
 	    HTChunkPutc(string, c);
 #ifdef USE_PRETTYSRC
@@ -4221,9 +4122,9 @@
 #endif
 	}
 
-    }				/* switch on context->state */
+    }				/* switch on me->state */
     CTRACE2(TRACE_SGML, (tfp, "SGML after  %s|%.*s|%c|\n",
-			 state_name(context->state),
+			 state_name(me->state),
 			 string->size,
 			 NonNull(string->data),
 			 UCH(c)));
@@ -4234,31 +4135,31 @@
      * buffer.  If so, move the new stuff to the beginning of active_include. 
      * - kw
      */
-    if (context->include != NULL) {
-	if (context->include[0] == '\0') {
-	    FREE(context->include);
+    if (me->include != NULL) {
+	if (me->include[0] == '\0') {
+	    FREE(me->include);
 	} else {
-	    if (context->active_include &&
-		context->active_include[context->include_index] != '\0')
-		StrAllocCat(context->include,
-			    context->active_include + context->include_index);
-	    FREE(context->active_include);
-	    context->active_include = context->include;
-	    context->include_index = 0;
-	    context->include = NULL;
+	    if (me->active_include &&
+		me->active_include[me->include_index] != '\0')
+		StrAllocCat(me->include,
+			    me->active_include + me->include_index);
+	    FREE(me->active_include);
+	    me->active_include = me->include;
+	    me->include_index = 0;
+	    me->include = NULL;
 	}
     }
 
     /*
      * Check whether we've added anything to the recover buffer.  - FM
      */
-    if (context->recover != NULL) {
-	if (context->recover[context->recover_index] == '\0') {
-	    FREE(context->recover);
-	    context->recover_index = 0;
+    if (me->recover != NULL) {
+	if (me->recover[me->recover_index] == '\0') {
+	    FREE(me->recover);
+	    me->recover_index = 0;
 	} else {
-	    c = UCH(context->recover[context->recover_index]);
-	    context->recover_index++;
+	    c = UCH(me->recover[me->recover_index]);
+	    me->recover_index++;
 	    goto top;
 	}
     }
@@ -4267,20 +4168,20 @@
      * Check whether an external function had added anything to the include
      * buffer; it should now be in active_include.  - FM / kw
      */
-    if (context->active_include != NULL) {
-	if (context->active_include[context->include_index] == '\0') {
-	    FREE(context->active_include);
-	    context->include_index = 0;
+    if (me->active_include != NULL) {
+	if (me->active_include[me->include_index] == '\0') {
+	    FREE(me->active_include);
+	    me->include_index = 0;
 	} else {
-	    if (context->current_tag_charset == UTF8_handle ||
-		context->T.trans_from_uni) {
+	    if (me->current_tag_charset == UTF8_handle ||
+		me->T.trans_from_uni) {
 		/*
 		 * If it looks like we would have fed UTF-8 to the next
 		 * processing stage, assume that whatever we were fed back is
 		 * in UTF-8 form, too.  This won't be always true for all uses
 		 * of the include buffer, but it's a start.  - kw
 		 */
-		char *puni = context->active_include + context->include_index;
+		const char *puni = me->active_include + me->include_index;
 
 		c = UCH(*puni);
 		clong = UCGetUniFromUtf8String(&puni);
@@ -4288,17 +4189,17 @@
 		    c = UCH((clong & 0xff));
 		}
 		saved_char_in = '\0';
-		context->include_index = (int) (puni
-						- context->active_include
-						+ 1);
+		me->include_index = (int) (puni
+					   - me->active_include
+					   + 1);
 		goto top1;
 	    } else {
 		/*
 		 * Otherwise assume no UTF-8 - do charset-naive processing and
 		 * hope for the best.  - kw
 		 */
-		c = UCH(context->active_include[context->include_index]);
-		context->include_index++;
+		c = UCH(me->active_include[me->include_index]);
+		me->include_index++;
 		goto top;
 	    }
 	}
@@ -4308,38 +4209,38 @@
      * Check whether an external function has added anything to the csi buffer. 
      * - FM
      */
-    if (context->csi != NULL) {
-	if (context->csi[context->csi_index] == '\0') {
-	    FREE(context->csi);
-	    context->csi_index = 0;
+    if (me->csi != NULL) {
+	if (me->csi[me->csi_index] == '\0') {
+	    FREE(me->csi);
+	    me->csi_index = 0;
 	} else {
-	    c = UCH(context->csi[context->csi_index]);
-	    context->csi_index++;
+	    c = UCH(me->csi[me->csi_index]);
+	    me->csi_index++;
 	    goto top;
 	}
     }
 }				/* SGML_character */
 
-static void InferUtfFromBom(HTStream *context, int chndl)
+static void InferUtfFromBom(HTStream *me, int chndl)
 {
-    HTAnchor_setUCInfoStage(context->node_anchor, chndl,
+    HTAnchor_setUCInfoStage(me->node_anchor, chndl,
 			    UCT_STAGE_PARSER,
 			    UCT_SETBY_PARSER);
-    change_chartrans_handling(context);
+    change_chartrans_handling(me);
 }
 
 /*
  * Avoid rewrite of SGML_character() to handle hypothetical case of UTF-16
  * webpages, by pretending that the data is UTF-8.
  */
-static void SGML_widechar(HTStream *context, int ch)
+static void SGML_widechar(HTStream *me, int ch)
 {
-    if (!UCPutUtf8_charstring(context, SGML_character, (UCode_t) ch)) {
-	SGML_character(context, ch);
+    if (!UCPutUtf8_charstring(me, SGML_character, (UCode_t) ch)) {
+	SGML_character(me, ch);
     }
 }
 
-static void SGML_write(HTStream *context, const char *str, int l)
+static void SGML_write(HTStream *me, const char *str, int l)
 {
     const char *p;
     const char *e = str + l;
@@ -4348,41 +4249,41 @@
 	if (l > 3
 	    && !MemCmp(str, "\357\273\277", 3)) {
 	    CTRACE((tfp, "SGML_write found UTF-8 BOM\n"));
-	    InferUtfFromBom(context, UTF8_handle);
+	    InferUtfFromBom(me, UTF8_handle);
 	    str += 3;
 	} else if (l > 2) {
 	    if (!MemCmp(str, "\377\376", 2)) {
 		CTRACE((tfp, "SGML_write found UCS-2 LE BOM\n"));
-		InferUtfFromBom(context, UTF8_handle);
+		InferUtfFromBom(me, UTF8_handle);
 		str += 2;
-		context->T.ucs_mode = -1;
+		me->T.ucs_mode = -1;
 	    } else if (!MemCmp(str, "\376\377", 2)) {
 		CTRACE((tfp, "SGML_write found UCS-2 BE BOM\n"));
-		InferUtfFromBom(context, UTF8_handle);
+		InferUtfFromBom(me, UTF8_handle);
 		str += 2;
-		context->T.ucs_mode = 1;
+		me->T.ucs_mode = 1;
 	    }
 	}
     }
-    switch (context->T.ucs_mode) {
+    switch (me->T.ucs_mode) {
     case -1:
 	for (p = str; p < e; p += 2)
-	    SGML_widechar(context, (UCH(p[1]) << 8) | UCH(p[0]));
+	    SGML_widechar(me, (UCH(p[1]) << 8) | UCH(p[0]));
 	break;
     case 1:
 	for (p = str; p < e; p += 2)
-	    SGML_widechar(context, (UCH(p[0]) << 8) | UCH(p[1]));
+	    SGML_widechar(me, (UCH(p[0]) << 8) | UCH(p[1]));
 	break;
     default:
 	for (p = str; p < e; p++)
-	    SGML_character(context, *p);
+	    SGML_character(me, *p);
 	break;
     }
 }
 
-static void SGML_string(HTStream *context, const char *str)
+static void SGML_string(HTStream *me, const char *str)
 {
-    SGML_write(context, str, (int) strlen(str));
+    SGML_write(me, str, (int) strlen(str));
 }
 
 /*_______________________________________________________________________
@@ -4414,38 +4315,38 @@
 		   HTParentAnchor *anchor,
 		   HTStructured * target)
 {
-    HTStream *context = typecalloc(struct _HTStream);
+    HTStream *me = typecalloc(struct _HTStream);
 
-    if (!context)
+    if (!me)
 	outofmem(__FILE__, "SGML_begin");
 
-    assert(context != NULL);
+    assert(me != NULL);
 
-    context->isa = &SGMLParser;
-    context->string = HTChunkCreate(128);	/* Grow by this much */
-    context->dtd = dtd;
-    context->target = target;
-    context->actions = (const HTStructuredClass *) (((HTStream *) target)->isa);
+    me->isa = &SGMLParser;
+    me->string = HTChunkCreate(128);	/* Grow by this much */
+    me->dtd = dtd;
+    me->target = target;
+    me->actions = (const HTStructuredClass *) (((HTStream *) target)->isa);
     /* Ugh: no OO */
-    context->unknown_tag = &HTTag_unrecognized;
-    context->current_tag = context->slashedtag = NULL;
-    context->state = S_text;
+    me->unknown_tag = &HTTag_unrecognized;
+    me->current_tag = me->slashedtag = NULL;
+    me->state = S_text;
 #ifdef CALLERDATA
-    context->callerData = (void *) callerData;
+    me->callerData = (void *) callerData;
 #endif /* CALLERDATA */
 
-    context->node_anchor = anchor;	/* Could be NULL? */
-    context->utf_buf_p = context->utf_buf;
-    UCTransParams_clear(&context->T);
-    context->inUCLYhndl = HTAnchor_getUCLYhndl(anchor,
-					       UCT_STAGE_PARSER);
-    if (context->inUCLYhndl < 0) {
+    me->node_anchor = anchor;	/* Could be NULL? */
+    me->U.utf_buf_p = me->U.utf_buf;
+    UCTransParams_clear(&me->T);
+    me->inUCLYhndl = HTAnchor_getUCLYhndl(anchor,
+					  UCT_STAGE_PARSER);
+    if (me->inUCLYhndl < 0) {
 	HTAnchor_copyUCInfoStage(anchor,
 				 UCT_STAGE_PARSER,
 				 UCT_STAGE_MIME,
 				 -1);
-	context->inUCLYhndl = HTAnchor_getUCLYhndl(anchor,
-						   UCT_STAGE_PARSER);
+	me->inUCLYhndl = HTAnchor_getUCLYhndl(anchor,
+					      UCT_STAGE_PARSER);
     }
 #ifdef CAN_SWITCH_DISPLAY_CHARSET	/* Allow a switch to a more suitable display charset */
     else if (anchor->UCStages
@@ -4460,24 +4361,24 @@
     }
 #endif
 
-    context->inUCI = HTAnchor_getUCInfoStage(anchor,
-					     UCT_STAGE_PARSER);
-    set_chartrans_handling(context, anchor, -1);
-
-    context->recover = NULL;
-    context->recover_index = 0;
-    context->include = NULL;
-    context->active_include = NULL;
-    context->include_index = 0;
-    context->url = NULL;
-    context->csi = NULL;
-    context->csi_index = 0;
+    me->inUCI = HTAnchor_getUCInfoStage(anchor,
+					UCT_STAGE_PARSER);
+    set_chartrans_handling(me, anchor, -1);
+
+    me->recover = NULL;
+    me->recover_index = 0;
+    me->include = NULL;
+    me->active_include = NULL;
+    me->include_index = 0;
+    me->url = NULL;
+    me->csi = NULL;
+    me->csi_index = 0;
 
 #ifdef USE_PRETTYSRC
     if (psrc_view) {
 	psrc_view = FALSE;
 	mark_htext_as_source = TRUE;
-	SGML_string(context,
+	SGML_string(me,
 		    "<HTML><HEAD><TITLE>source</TITLE></HEAD><BODY><PRE>");
 	psrc_view = TRUE;
 	psrc_convert_string = FALSE;
@@ -4486,7 +4387,7 @@
 #endif
 
     sgml_offset = 0;
-    return context;
+    return me;
 }
 
 /*
Index: WWW/Library/Implementation/UCAux.h
--- 2.8.9dev.1/WWW/Library/Implementation/UCAux.h	Sat Dec 11 15:26:32 2010
+++ 2.8.9dev.2/WWW/Library/Implementation/UCAux.h	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAux.h,v 1.18 2010/11/07 21:20:59 tom Exp $
+ * $LynxId: UCAux.h,v 1.22 2014/12/10 09:48:41 tom Exp $
  */
 #ifndef UCAUX_H
 #define UCAUX_H
@@ -46,6 +46,21 @@
     };
     typedef struct _UCTransParams UCTransParams;
 
+    typedef struct {
+	char utf_count;
+	UCode_t utf_char;
+	char utf_buf[8];
+	char *utf_buf_p;
+    } UTFDecodeState;
+
+    typedef enum {
+	dUTF8_ok,
+	dUTF8_err,
+	dUTF8_more
+    } dUTF8;
+
+    extern dUTF8 HTDecodeUTF8(UTFDecodeState * me, int *c_in_out, UCode_t *result);
+
     extern void UCSetTransParams(UCTransParams * pT, int cs_in,
 				 const LYUCcharset *p_in,
 				 int cs_out,
@@ -69,7 +84,7 @@
     extern BOOL UCConvertUniToUtf8(UCode_t code,
 				   char *buffer);
 
-    extern UCode_t UCGetUniFromUtf8String(char **ppuni);
+    extern UCode_t UCGetUniFromUtf8String(const char **ppuni);
 
 #ifdef __cplusplus
 }
Index: WWW/Library/Implementation/UCMap.h
--- 2.8.9dev.1/WWW/Library/Implementation/UCMap.h	Mon Feb 13 02:46:17 2012
+++ 2.8.9dev.2/WWW/Library/Implementation/UCMap.h	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCMap.h,v 1.27 2011/12/01 02:00:57 tom Exp $
+ * $LynxId: UCMap.h,v 1.28 2014/12/07 14:40:40 tom Exp $
  */
 #ifndef UCMAP_H
 #define UCMAP_H
@@ -11,6 +11,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#define UCS_HIDE 0xffff
+#define UCS_REPL 0xfffd
+
     typedef enum {
 	ucError = -1,
 	ucZeroWidth = -2,
Index: aclocal.m4
--- 2.8.9dev.1/aclocal.m4	Sat Jan 11 19:06:15 2014
+++ 2.8.9dev.2/aclocal.m4	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.210 2014/01/11 17:09:11 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.215 2014/12/04 11:27:54 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -596,7 +596,7 @@
   AC_SUBST(GENCAT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
 dnl ------------------
 dnl Conditionally generate script according to whether we're using a given autoconf.
 dnl
@@ -605,7 +605,7 @@
 dnl $3 = code to use if AC_ACVERSION is older than $1.
 define([CF_ACVERSION_CHECK],
 [
-ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
 ifdef([m4_version_compare],
 [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 [CF_ACVERSION_COMPARE(
@@ -622,7 +622,7 @@
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
@@ -647,7 +647,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -684,7 +684,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -811,13 +811,31 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
+dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
 dnl -----------
-dnl Add one or more libraries, used to enforce consistency.
+dnl Add one or more libraries, used to enforce consistency.  Libraries are
+dnl prepended to an existing list, since their dependencies are assumed to
+dnl already exist in the list.
 dnl
 dnl $1 = libraries to add, with the "-l", etc.
 dnl $2 = variable to update (default $LIBS)
-AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
+AC_DEFUN([CF_ADD_LIBS],[
+cf_add_libs="$1"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+ifelse($2,,LIBS,[$2])="$cf_add_libs"
+])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22
 dnl ----------------
@@ -1388,7 +1406,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58
+dnl CF_CHECK_CFLAGS version: 3 updated: 2014/07/22 05:32:57
 dnl ---------------
 dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
 dnl a build-configuration such as imake.  These have the pitfall that they
@@ -1400,10 +1418,10 @@
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 CF_ADD_CFLAGS($1,yes)
-if test "$cf_check_cflags" != "$CFLAGS" ; then
+if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],,
 	[CF_VERBOSE(test-compile failed.  Undoing change to \$CFLAGS)
-	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 CF_VERBOSE(but keeping change to \$CPPFLAGS)
 	 fi
 	 CFLAGS="$cf_check_flags"])
@@ -1565,13 +1583,18 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_SSL_X509 version: 4 updated: 2008/12/11 19:00:39
+dnl CF_CHECK_SSL_X509 version: 5 updated: 2014/11/30 18:19:56
 dnl -----------------
 dnl Check for X509 support in the SSL library.
 define([CF_CHECK_SSL_X509],[
 AC_MSG_CHECKING(for X509 support)
 AC_TRY_LINK(CF__SSL_HEAD [
-#include <openssl/x509.h>],
+#if defined(USE_GNUTLS_INCL)
+#include <gnutls/x509.h>
+#else
+#include <openssl/x509.h>
+#endif
+],
 	[X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))],
 	[cf_x509_support=yes],
 	[cf_x509_support=no])
@@ -1745,7 +1768,7 @@
 CF_TERM_HEADER
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 17 updated: 2011/05/14 16:07:29
+dnl CF_CURSES_FUNCS version: 18 updated: 2014/07/19 18:44:41
 dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
 AC_DEFUN([CF_CURSES_FUNCS],
@@ -1766,6 +1789,7 @@
 			[
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
+fprintf(stderr, "testing linkage of $cf_func:%p\n", foo);
 if (foo + 1234 > 5678)
 	${cf_cv_main_return:-return}(foo);
 #endif
@@ -3048,7 +3072,7 @@
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNUTLS version: 22 updated: 2012/11/08 20:57:52
+dnl CF_GNUTLS version: 23 updated: 2014/11/30 18:19:56
 dnl ---------
 dnl Check for gnutls library (TLS "is" SSL)
 dnl $1 = the [optional] directory in which the library may be found
@@ -3124,7 +3148,7 @@
 			cf_cv_have_gnutls=yes,
 			cf_cv_have_gnutls=no,
 			,
-			ifelse([$2],,[-lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt],[-lgnutls -lgcrypt]))
+			ifelse([$2],,[-lgnutls-openssl]))
 
 		CPPFLAGS=$cf_gnutls_CPPFLAGS
 	fi
@@ -3143,7 +3167,10 @@
 		if test -n "$cf_cv_library_path_gnutls" ; then
 			CF_ADD_LIBDIR($cf_cv_library_path_gnutls)
 		fi
-		CF_ADD_LIBS(-lgnutls -lgcrypt)
+		CF_ADD_LIBS(-lgnutls)
+		AC_CHECK_FUNC(gnutls_rnd,
+				[AC_DEFINE(HAVE_GNUTLS_RND)],
+				[CF_ADD_LIBS(-lgcrypt)])
 
 		ifelse([$2],,
 			[if test "$cf_pkg_gnutls" = none ; then
@@ -3287,7 +3314,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05
+dnl CF_INTEL_COMPILER version: 6 updated: 2014/03/17 13:13:07
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -3316,7 +3343,7 @@
 make an error
 #endif
 ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
-cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 ],[])
 		ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
 		AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2]))
@@ -3491,7 +3518,7 @@
 test $cf_cv_locale = yes && { ifelse($1,,AC_DEFINE(LOCALE,1,[Define to 1 if we have locale support]),[$1]) }
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
+dnl CF_MAKEFLAGS version: 15 updated: 2014/05/10 16:43:23
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
@@ -3510,7 +3537,7 @@
 CF_EOF
 		cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ 	]]*$,,'`
 		case "$cf_result" in
-		.*k)
+		.*k|.*kw)
 			cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
 			case "$cf_result" in
 			.*CC=*)	cf_cv_makeflags=
@@ -4542,7 +4569,7 @@
 AC_CHECK_TOOL(AR, ar, ar)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
 dnl ----------
 dnl standard check for CC, plus followup sanity checks
 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
@@ -4552,7 +4579,7 @@
 CF_ACVERSION_CHECK(2.52,
 	[AC_PROG_CC_STDC],
 	[CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS 
+CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PROG_EXT version: 11 updated: 2012/10/06 08:57:51
@@ -5474,7 +5501,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50
+dnl CF_SUBDIR_PATH version: 7 updated: 2014/12/04 04:33:06
 dnl --------------
 dnl Construct a search-list for a nonstandard header/lib-file
 dnl	$1 = the variable to return as result
@@ -5484,11 +5511,18 @@
 [
 $1=
 
-CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
 CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
-CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix)
-CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
-CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
+
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	[$]HOME
+do
+	CF_ADD_SUBDIR_PATH($1,$2,$3,$cf_subdir_prefix,$prefix)
+done
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_SYSTEM_MAIL_FLAGS version: 4 updated: 2012/11/08 20:57:52
@@ -6432,7 +6466,7 @@
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
+dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14
 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,
@@ -6483,6 +6517,9 @@
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 	CF_GNU_SOURCE
 	;;
+minix*) #(vi
+	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+	;;
 mirbsd*) #(vi
 	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
 	cf_XOPEN_SOURCE=
@@ -6510,6 +6547,11 @@
 	;;
 solaris2.*) #(vi
 	cf_xopen_source="-D__EXTENSIONS__"
+	cf_cv_xopen_source=broken
+	;;
+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
+	cf_XOPEN_SOURCE=
+	cf_POSIX_C_SOURCE=
 	;;
 *)
 	CF_TRY_XOPEN_SOURCE
@@ -6518,7 +6560,7 @@
 esac
 
 if test -n "$cf_xopen_source" ; then
-	CF_ADD_CFLAGS($cf_xopen_source)
+	CF_ADD_CFLAGS($cf_xopen_source,true)
 fi
 
 dnl In anything but the default case, we may have system-specific setting
@@ -6551,7 +6593,7 @@
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 21 updated: 2013/07/06 21:27:06
+dnl CF_X_ATHENA version: 22 updated: 2014/07/12 18:57:58
 dnl -----------
 dnl Check for Xaw (Athena) libraries
 dnl
@@ -6571,6 +6613,17 @@
 	AC_MSG_RESULT(no)
 fi
 
+AC_MSG_CHECKING(if you want to link with Xaw 3d xft library)
+withval=
+AC_ARG_WITH(Xaw3dxft,
+	[  --with-Xaw3dxft         link with Xaw 3d xft library])
+if test "$withval" = yes ; then
+	cf_x_athena=Xaw3dxft
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+
 AC_MSG_CHECKING(if you want to link with neXT Athena library)
 withval=
 AC_ARG_WITH(neXtaw,
@@ -6770,14 +6823,27 @@
 		[CF_ADD_LIB(Xext)])])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 21 updated: 2012/10/04 06:57:36
+dnl CF_X_TOOLKIT version: 22 updated: 2014/07/13 14:33:27
 dnl ------------
 dnl Check for X Toolkit libraries
-dnl
 AC_DEFUN([CF_X_TOOLKIT],
 [
 AC_REQUIRE([AC_PATH_XTRA])
 AC_REQUIRE([CF_CHECK_CACHE])
+
+# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and
+# in some cases has installed dummy files in the former, other cases replaced
+# it with a link to the new location).  This complicates the configure script. 
+# Check for that pitfall, and recover using pkg-config
+#
+# If none of these are set, the configuration is almost certainly broken.
+if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}"
+then
+	CF_TRY_PKG_CONFIG(x11,,[AC_MSG_WARN(unable to find X11 library)])
+	CF_TRY_PKG_CONFIG(ice,,[AC_MSG_WARN(unable to find ICE library)])
+	CF_TRY_PKG_CONFIG(sm,,[AC_MSG_WARN(unable to find SM library)])
+	CF_TRY_PKG_CONFIG(xt,,[AC_MSG_WARN(unable to find Xt library)])
+fi
 
 cf_have_X_LIBS=no
 
Index: config.guess
--- 2.8.9dev.1/config.guess	Sat Jan 11 19:06:15 2014
+++ 2.8.9dev.2/config.guess	Mon Dec 22 01:39:40 2014
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2014-03-23'
 
 # 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
@@ -149,7 +149,7 @@
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -826,7 +826,7 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +969,10 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1370,154 +1370,6 @@
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
 esac
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
 
 cat >&2 <<EOF
 $0: unable to guess system type
Index: config.hin
--- 2.8.9dev.1/config.hin	Sun Mar  9 21:43:10 2014
+++ 2.8.9dev.2/config.hin	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.136 2014/03/09 14:08:59 tom Exp $
+ * $LynxId: config.hin,v 1.137 2014/11/30 23:05:04 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -81,6 +81,7 @@
 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_GETUID
 #undef HAVE_GNUTLS_PRIORITY_SET_DIRECT
+#undef HAVE_GNUTLS_RND
 #undef HAVE_H_ERRNO
 #undef HAVE_ICONV		/* AM_ICONV */
 #undef HAVE_INET_ATON		/* CF_INET_ADDR */
Index: config.sub
--- 2.8.9dev.1/config.sub	Sat Jan 11 19:06:15 2014
+++ 2.8.9dev.2/config.sub	Mon Dec 22 01:39:40 2014
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2014-07-28'
 
 # 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
@@ -283,8 +283,10 @@
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -296,8 +298,7 @@
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -402,8 +403,10 @@
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +418,7 @@
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -824,6 +828,10 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1369,14 +1377,14 @@
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1592,9 +1600,6 @@
 		os=-elf
 		;;
 	mips*-*)
-		os=-elf
-		;;
-	or1k-*)
 		os=-elf
 		;;
 	or32-*)
Index: configure
--- 2.8.9dev.1/configure	Sun Mar  9 21:43:10 2014
+++ 2.8.9dev.2/configure	Mon Dec 22 01:39:40 2014
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in 2.8.8rel.2.
+# From configure.in 2.8.9dev.2.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20121002.
+# Generated by Autoconf 2.52.20141204.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -806,6 +806,7 @@
                           disable "Up-to" links in directory listings
 Special Libraries for PDCurses X11:
   --with-Xaw3d            link with Xaw 3d library
+  --with-Xaw3dxft         link with Xaw 3d xft library
   --with-neXtaw           link with neXT Athena library
   --with-XawPlus          link with Athena-Plus library
   --with-x                use the X Window System
@@ -879,7 +880,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20121002.  Invocation command line was
+generated by GNU Autoconf 2.52.20141204.  Invocation command line was
 
   $ $0 $@
 
@@ -1003,7 +1004,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1006: loading site script $ac_site_file" >&5
+    { echo "$as_me:1007: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -1014,7 +1015,7 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:1017: loading cache $cache_file" >&5
+    { echo "$as_me:1018: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1022,7 +1023,7 @@
     esac
   fi
 else
-  { echo "$as_me:1025: creating cache $cache_file" >&5
+  { echo "$as_me:1026: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1038,21 +1039,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:1041: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1042: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:1045: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1046: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:1051: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1052: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:1053:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1054:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1055:   current value: $ac_new_val" >&5
+        { echo "$as_me:1056:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1071,9 +1072,9 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:1074: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1075: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:1076: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1077: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1085,19 +1086,19 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
+case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C=	# newlines do not sed ;-) only broken shells would use this case anyway
+		   ECHO_T='	' ;;
   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
   *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1097: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1098: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1100: \$? = $ac_status" >&5
+  echo "$as_me:1101: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1132,7 +1133,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1135: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1136: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1142,11 +1143,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1145: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1146: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1149: checking build system type" >&5
+echo "$as_me:1150: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1155,23 +1156,23 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1158: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1159: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1162: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1163: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1167: result: $ac_cv_build" >&5
+echo "$as_me:1168: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1174: checking host system type" >&5
+echo "$as_me:1175: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1180,12 +1181,12 @@
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1183: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1184: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1188: result: $ac_cv_host" >&5
+echo "$as_me:1189: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1193,7 +1194,7 @@
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-	echo "$as_me:1196: checking target system type" >&5
+	echo "$as_me:1197: checking target system type" >&5
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1202,12 +1203,12 @@
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:1205: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1206: error: $ac_config_sub $ac_cv_target_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1210: result: $ac_cv_target" >&5
+echo "$as_me:1211: result: $ac_cv_target" >&5
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1239,13 +1240,13 @@
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1242: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1243: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1246: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1247: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1248: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1249: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1253,7 +1254,7 @@
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"
-  { echo "$as_me:1256: WARNING: overriding system type $host_os to $withval" >&5
+  { echo "$as_me:1257: WARNING: overriding system type $host_os to $withval" >&5
 echo "$as_me: WARNING: overriding system type $host_os to $withval" >&2;}
  host_os=$withval
 fi;
@@ -1273,9 +1274,9 @@
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.1
+VERSION=2.8.9dev.2
 
-echo "$as_me:1278: checking for DESTDIR" >&5
+echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
 
 # Check whether --with-destdir or --without-destdir was given.
@@ -1311,7 +1312,7 @@
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:1314: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:1315: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -1320,7 +1321,7 @@
 fi
 eval DESTDIR="$withval"
 
-echo "$as_me:1323: result: $DESTDIR" >&5
+echo "$as_me:1324: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 case $host_os in
@@ -1339,7 +1340,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1342: checking for $ac_word" >&5
+echo "$as_me:1343: 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
@@ -1354,7 +1355,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1357: found $ac_dir/$ac_word" >&5
+echo "$as_me:1358: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1362,10 +1363,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1365: result: $CC" >&5
+  echo "$as_me:1366: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1368: result: no" >&5
+  echo "$as_me:1369: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1374,7 +1375,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1377: checking for $ac_word" >&5
+echo "$as_me:1378: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1389,7 +1390,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1392: found $ac_dir/$ac_word" >&5
+echo "$as_me:1393: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1397,10 +1398,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1400: result: $ac_ct_CC" >&5
+  echo "$as_me:1401: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1403: result: no" >&5
+  echo "$as_me:1404: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1413,7 +1414,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1416: checking for $ac_word" >&5
+echo "$as_me:1417: 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
@@ -1428,7 +1429,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1431: found $ac_dir/$ac_word" >&5
+echo "$as_me:1432: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1436,10 +1437,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1439: result: $CC" >&5
+  echo "$as_me:1440: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1442: result: no" >&5
+  echo "$as_me:1443: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1448,7 +1449,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1451: checking for $ac_word" >&5
+echo "$as_me:1452: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1463,7 +1464,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1466: found $ac_dir/$ac_word" >&5
+echo "$as_me:1467: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1471,10 +1472,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1474: result: $ac_ct_CC" >&5
+  echo "$as_me:1475: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1477: result: no" >&5
+  echo "$as_me:1478: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1487,7 +1488,7 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1490: checking for $ac_word" >&5
+echo "$as_me:1491: 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
@@ -1507,7 +1508,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1510: found $ac_dir/$ac_word" >&5
+echo "$as_me:1511: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1529,10 +1530,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1532: result: $CC" >&5
+  echo "$as_me:1533: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1535: result: no" >&5
+  echo "$as_me:1536: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1543,7 +1544,7 @@
   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:1546: checking for $ac_word" >&5
+echo "$as_me:1547: 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
@@ -1558,7 +1559,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1561: found $ac_dir/$ac_word" >&5
+echo "$as_me:1562: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1566,10 +1567,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1569: result: $CC" >&5
+  echo "$as_me:1570: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1572: result: no" >&5
+  echo "$as_me:1573: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1582,7 +1583,7 @@
 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:1585: checking for $ac_word" >&5
+echo "$as_me:1586: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1597,7 +1598,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1600: found $ac_dir/$ac_word" >&5
+echo "$as_me:1601: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1605,10 +1606,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1608: result: $ac_ct_CC" >&5
+  echo "$as_me:1609: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1611: result: no" >&5
+  echo "$as_me:1612: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1620,32 +1621,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1623: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1624: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1628:" \
+echo "$as_me:1629:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1631: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1632: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1634: \$? = $ac_status" >&5
+  echo "$as_me:1635: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1636: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1637: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1639: \$? = $ac_status" >&5
+  echo "$as_me:1640: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1641: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1642: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1644: \$? = $ac_status" >&5
+  echo "$as_me:1645: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1648 "configure"
+#line 1649 "configure"
 #include "confdefs.h"
 
 int
@@ -1661,13 +1662,13 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1664: checking for C compiler default output" >&5
+echo "$as_me:1665: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1667: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1668: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1670: \$? = $ac_status" >&5
+  echo "$as_me:1671: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1690,34 +1691,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1693: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1694: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1699: result: $ac_file" >&5
+echo "$as_me:1700: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1704: checking whether the C compiler works" >&5
+echo "$as_me:1705: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1713: \$? = $ac_status" >&5
+  echo "$as_me:1714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1720: error: cannot run C compiled programs.
+	{ { echo "$as_me:1721: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1725,24 +1726,24 @@
     fi
   fi
 fi
-echo "$as_me:1728: result: yes" >&5
+echo "$as_me:1729: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1735: checking whether we are cross compiling" >&5
+echo "$as_me:1736: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1737: result: $cross_compiling" >&5
+echo "$as_me:1738: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1740: checking for executable suffix" >&5
+echo "$as_me:1741: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1745: \$? = $ac_status" >&5
+  echo "$as_me:1746: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1758,25 +1759,25 @@
   esac
 done
 else
-  { { echo "$as_me:1761: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1762: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1767: result: $ac_cv_exeext" >&5
+echo "$as_me:1768: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1773: checking for object suffix" >&5
+echo "$as_me:1774: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1779 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 int
@@ -1788,10 +1789,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1792: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1794: \$? = $ac_status" >&5
+  echo "$as_me:1795: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1803,24 +1804,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1806: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1807: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1813: result: $ac_cv_objext" >&5
+echo "$as_me:1814: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1817: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1818: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1823 "configure"
+#line 1824 "configure"
 #include "confdefs.h"
 
 int
@@ -1835,16 +1836,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1841: \$? = $ac_status" >&5
+  echo "$as_me:1842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1847: \$? = $ac_status" >&5
+  echo "$as_me:1848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1856,19 +1857,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1859: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1860: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1865: checking whether $CC accepts -g" >&5
+echo "$as_me:1866: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1871 "configure"
+#line 1872 "configure"
 #include "confdefs.h"
 
 int
@@ -1880,16 +1881,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1886: \$? = $ac_status" >&5
+  echo "$as_me:1887: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1892: \$? = $ac_status" >&5
+  echo "$as_me:1893: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1899,7 +1900,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1902: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1903: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1926,16 +1927,16 @@
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1932: \$? = $ac_status" >&5
+  echo "$as_me:1933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1938: \$? = $ac_status" >&5
+  echo "$as_me:1939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1947,7 +1948,7 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1950 "configure"
+#line 1951 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1960,16 +1961,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1966: \$? = $ac_status" >&5
+  echo "$as_me:1967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1972: \$? = $ac_status" >&5
+  echo "$as_me:1973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1979,7 +1980,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1982 "configure"
+#line 1983 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1991,16 +1992,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1997: \$? = $ac_status" >&5
+  echo "$as_me:1998: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2003: \$? = $ac_status" >&5
+  echo "$as_me:2004: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2030,15 +2031,15 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2033: checking version of $CC" >&5
+	echo "$as_me:2034: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2037: result: $GCC_VERSION" >&5
+	echo "$as_me:2038: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
-echo "$as_me:2041: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2042: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2046,7 +2047,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2049 "configure"
+#line 2050 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2095,16 +2096,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2098: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2101: \$? = $ac_status" >&5
+  echo "$as_me:2102: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2107: \$? = $ac_status" >&5
+  echo "$as_me:2108: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2121,10 +2122,10 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2124: result: none needed" >&5
+    echo "$as_me:2125: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2127: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2128: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2132,13 +2133,13 @@
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
-echo "$as_me:2135: checking \$CC variable" >&5
+echo "$as_me:2136: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in #(vi
 *[\ \	]-[IUD]*)
-	echo "$as_me:2139: result: broken" >&5
+	echo "$as_me:2140: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2141: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ 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/^[^ 	]*[ 	]//'`
@@ -2159,7 +2160,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -2200,7 +2201,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -2224,7 +2225,7 @@
 
 	;;
 *)
-	echo "$as_me:2227: result: ok" >&5
+	echo "$as_me:2228: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2235,7 +2236,7 @@
 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:2238: checking how to run the C preprocessor" >&5
+echo "$as_me:2239: 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
@@ -2256,18 +2257,18 @@
   # 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 2259 "configure"
+#line 2260 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2264: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2265: \"$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:2270: \$? = $ac_status" >&5
+  echo "$as_me:2271: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2290,17 +2291,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2293 "configure"
+#line 2294 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2297: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2298: \"$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:2303: \$? = $ac_status" >&5
+  echo "$as_me:2304: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2337,7 +2338,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2340: result: $CPP" >&5
+echo "$as_me:2341: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2347,18 +2348,18 @@
   # 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 2350 "configure"
+#line 2351 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2355: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2356: \"$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:2361: \$? = $ac_status" >&5
+  echo "$as_me:2362: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2381,17 +2382,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2384 "configure"
+#line 2385 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2388: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2389: \"$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:2394: \$? = $ac_status" >&5
+  echo "$as_me:2395: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2419,7 +2420,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2422: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2423: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2431,27 +2432,27 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
-echo "$as_me:2434: checking whether ln -s works" >&5
+echo "$as_me:2435: 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:2438: result: yes" >&5
+  echo "$as_me:2439: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2441: result: no, using $LN_S" >&5
+  echo "$as_me:2442: 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:2448: result: Override: No symbolic links in mingw." >&5
+echo "$as_me:2449: result: Override: No symbolic links in mingw." >&5
 echo "${ECHO_T}Override: No symbolic links in mingw." >&6
 	;;
 *)
 	;;
 esac
-echo "$as_me:2454: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2455: 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
@@ -2471,11 +2472,11 @@
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2474: result: yes" >&5
+  echo "$as_me:2475: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2478: result: no" >&5
+  echo "$as_me:2479: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2492,7 +2493,7 @@
 # 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:2495: checking for a BSD compatible install" >&5
+echo "$as_me:2496: 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
@@ -2541,7 +2542,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2544: result: $INSTALL" >&5
+echo "$as_me:2545: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2556,7 +2557,7 @@
 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:2559: checking for $ac_word" >&5
+echo "$as_me:2560: 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
@@ -2571,7 +2572,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:2574: found $ac_dir/$ac_word" >&5
+echo "$as_me:2575: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2579,10 +2580,10 @@
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2582: result: $YACC" >&5
+  echo "$as_me:2583: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2585: result: no" >&5
+  echo "$as_me:2586: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2594,7 +2595,7 @@
 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:2597: checking for $ac_word" >&5
+echo "$as_me:2598: 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
@@ -2609,7 +2610,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2612: found $ac_dir/$ac_word" >&5
+echo "$as_me:2613: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2617,17 +2618,17 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2620: result: $LINT" >&5
+  echo "$as_me:2621: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2623: result: no" >&5
+  echo "$as_me:2624: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
-echo "$as_me:2630: checking for makeflags variable" >&5
+echo "$as_me:2631: 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
@@ -2643,7 +2644,7 @@
 CF_EOF
 		cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ 	]*$,,'`
 		case "$cf_result" in
-		.*k)
+		.*k|.*kw)
 			cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
 			case "$cf_result" in
 			.*CC=*)	cf_cv_makeflags=
@@ -2661,10 +2662,10 @@
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2664: result: $cf_cv_makeflags" >&5
+echo "$as_me:2665: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2667: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2668: 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
@@ -2691,7 +2692,7 @@
 fi
 
 fi
-echo "$as_me:2694: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2695: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -2702,7 +2703,7 @@
 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:2705: checking for $ac_word" >&5
+echo "$as_me:2706: 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
@@ -2717,7 +2718,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:2720: found $ac_dir/$ac_word" >&5
+echo "$as_me:2721: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2725,10 +2726,10 @@
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2728: result: $CTAGS" >&5
+  echo "$as_me:2729: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2731: result: no" >&5
+  echo "$as_me:2732: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2739,7 +2740,7 @@
 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:2742: checking for $ac_word" >&5
+echo "$as_me:2743: 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
@@ -2754,7 +2755,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:2757: found $ac_dir/$ac_word" >&5
+echo "$as_me:2758: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2762,10 +2763,10 @@
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2765: result: $ETAGS" >&5
+  echo "$as_me:2766: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2768: result: no" >&5
+  echo "$as_me:2769: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2774,7 +2775,7 @@
 
 # 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:2777: checking for $ac_word" >&5
+echo "$as_me:2778: 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
@@ -2789,7 +2790,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2792: found $ac_dir/$ac_word" >&5
+echo "$as_me:2793: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2798,17 +2799,17 @@
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2801: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2802: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2804: result: no" >&5
+  echo "$as_me:2805: 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:2811: checking for $ac_word" >&5
+echo "$as_me:2812: 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
@@ -2823,7 +2824,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2826: found $ac_dir/$ac_word" >&5
+echo "$as_me:2827: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2832,10 +2833,10 @@
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2835: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2836: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2838: result: no" >&5
+  echo "$as_me:2839: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2858,7 +2859,7 @@
 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:2861: checking for $ac_word" >&5
+echo "$as_me:2862: 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
@@ -2875,7 +2876,7 @@
   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:2878: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2879: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2886,10 +2887,10 @@
 WINDRES=$ac_cv_path_WINDRES
 
 if test -n "$WINDRES"; then
-  echo "$as_me:2889: result: $WINDRES" >&5
+  echo "$as_me:2890: result: $WINDRES" >&5
 echo "${ECHO_T}$WINDRES" >&6
 else
-  echo "$as_me:2892: result: no" >&5
+  echo "$as_me:2893: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2898,7 +2899,7 @@
   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:2901: checking for $ac_word" >&5
+echo "$as_me:2902: 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
@@ -2915,7 +2916,7 @@
   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:2918: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2919: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2927,10 +2928,10 @@
 ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
 
 if test -n "$ac_pt_WINDRES"; then
-  echo "$as_me:2930: result: $ac_pt_WINDRES" >&5
+  echo "$as_me:2931: result: $ac_pt_WINDRES" >&5
 echo "${ECHO_T}$ac_pt_WINDRES" >&6
 else
-  echo "$as_me:2933: result: no" >&5
+  echo "$as_me:2934: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2958,7 +2959,7 @@
 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:2961: checking for $ac_word" >&5
+echo "$as_me:2962: 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
@@ -2973,7 +2974,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:2976: found $ac_dir/$ac_word" >&5
+echo "$as_me:2977: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2981,10 +2982,10 @@
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:2984: result: $BUILD_CC" >&5
+  echo "$as_me:2985: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:2987: result: no" >&5
+  echo "$as_me:2988: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2992,12 +2993,12 @@
 done
 
 fi;
-	echo "$as_me:2995: checking for native build C compiler" >&5
+	echo "$as_me:2996: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:2997: result: $BUILD_CC" >&5
+	echo "$as_me:2998: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:3000: checking for native build C preprocessor" >&5
+	echo "$as_me:3001: 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.
@@ -3007,10 +3008,10 @@
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:3010: result: $BUILD_CPP" >&5
+	echo "$as_me:3011: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:3013: checking for native build C flags" >&5
+	echo "$as_me:3014: 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.
@@ -3018,10 +3019,10 @@
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:3021: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:3022: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:3024: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:3025: 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.
@@ -3029,10 +3030,10 @@
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:3032: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:3033: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:3035: checking for native build linker-flags" >&5
+	echo "$as_me:3036: 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.
@@ -3040,10 +3041,10 @@
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:3043: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:3044: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:3046: checking for native build linker-libraries" >&5
+	echo "$as_me:3047: 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.
@@ -3051,7 +3052,7 @@
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:3054: result: $BUILD_LIBS" >&5
+	echo "$as_me:3055: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -3061,7 +3062,7 @@
 	: ${BUILD_CC:='${CC}'}
 
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-		{ { echo "$as_me:3064: error: Cross-build requires two compilers.
+		{ { echo "$as_me:3065: 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;}
@@ -3082,7 +3083,7 @@
 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:3085: checking for $ac_word" >&5
+echo "$as_me:3086: 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
@@ -3097,7 +3098,7 @@
   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:3100: found $ac_dir/$ac_word" >&5
+echo "$as_me:3101: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3105,10 +3106,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3108: result: $RANLIB" >&5
+  echo "$as_me:3109: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3111: result: no" >&5
+  echo "$as_me:3112: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3117,7 +3118,7 @@
   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:3120: checking for $ac_word" >&5
+echo "$as_me:3121: 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
@@ -3132,7 +3133,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3135: found $ac_dir/$ac_word" >&5
+echo "$as_me:3136: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3141,10 +3142,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3144: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3145: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3147: result: no" >&5
+  echo "$as_me:3148: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3156,7 +3157,7 @@
 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:3159: checking for $ac_word" >&5
+echo "$as_me:3160: 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
@@ -3171,7 +3172,7 @@
   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:3174: found $ac_dir/$ac_word" >&5
+echo "$as_me:3175: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3179,10 +3180,10 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3182: result: $AR" >&5
+  echo "$as_me:3183: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3185: result: no" >&5
+  echo "$as_me:3186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3191,7 +3192,7 @@
   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:3194: checking for $ac_word" >&5
+echo "$as_me:3195: 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
@@ -3206,7 +3207,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:3209: found $ac_dir/$ac_word" >&5
+echo "$as_me:3210: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3215,10 +3216,10 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3218: result: $ac_ct_AR" >&5
+  echo "$as_me:3219: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3221: result: no" >&5
+  echo "$as_me:3222: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3227,7 +3228,7 @@
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3230: checking for options to update archives" >&5
+echo "$as_me:3231: 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
@@ -3250,13 +3251,13 @@
 		rm -f conftest.a
 
 		cat >conftest.$ac_ext <<EOF
-#line 3253 "configure"
+#line 3254 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-		if { (eval echo "$as_me:3256: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3259: \$? = $ac_status" >&5
+  echo "$as_me:3260: \$? = $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
@@ -3267,7 +3268,7 @@
 		else
 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:3270: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3271: testing cannot compile test-program ..." 1>&5
 
 			break
 		fi
@@ -3275,7 +3276,7 @@
 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
-echo "$as_me:3278: result: $cf_cv_ar_flags" >&5
+echo "$as_me:3279: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -3286,7 +3287,7 @@
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:3289: checking if you want to see long compiling messages" >&5
+echo "$as_me:3290: 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.
@@ -3320,7 +3321,7 @@
     ECHO_CC=''
 
 fi;
-echo "$as_me:3323: result: $enableval" >&5
+echo "$as_me:3324: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -3330,7 +3331,7 @@
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:3333: checking if you want to check memory-leaks" >&5
+echo "$as_me:3334: 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.
@@ -3347,7 +3348,7 @@
   with_leak_checks=no
 
 fi;
-echo "$as_me:3350: result: $with_leak_checks" >&5
+echo "$as_me:3351: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -3357,7 +3358,7 @@
 # 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:3360: checking if you want to enable debug-code" >&5
+echo "$as_me:3361: 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.
@@ -3374,7 +3375,7 @@
   with_debug=no
 
 fi;
-echo "$as_me:3377: result: $with_debug" >&5
+echo "$as_me:3378: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -3399,7 +3400,7 @@
 	esac
 fi
 
-echo "$as_me:3402: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:3403: 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.
@@ -3416,14 +3417,14 @@
   with_trace=yes
 
 fi;
-echo "$as_me:3419: result: $with_trace" >&5
+echo "$as_me:3420: 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:3426: checking if you want verbose trace code" >&5
+echo "$as_me:3427: 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.
@@ -3440,7 +3441,7 @@
   with_vertrace=no
 
 fi;
-echo "$as_me:3443: result: $with_vertrace" >&5
+echo "$as_me:3444: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test $with_vertrace = yes &&
 cat >>confdefs.h <<\EOF
@@ -3449,7 +3450,7 @@
 
 if test -n "$GCC"
 then
-echo "$as_me:3452: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:3453: 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.
@@ -3466,7 +3467,7 @@
   with_warnings=no
 
 fi;
-echo "$as_me:3469: result: $with_warnings" >&5
+echo "$as_me:3470: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -3489,10 +3490,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3492: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3493: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 3495 "${as_me:-configure}"
+#line 3496 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -3541,12 +3542,12 @@
 			;;
 		esac
 
-		if { (eval echo "$as_me:3544: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3547: \$? = $ac_status" >&5
+  echo "$as_me:3548: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3549: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3550: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in #(vi
@@ -3610,12 +3611,12 @@
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:3613: checking if this is really Intel C compiler" >&5
+		echo "$as_me:3614: 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 3618 "configure"
+#line 3619 "configure"
 #include "confdefs.h"
 
 int
@@ -3632,19 +3633,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3638: \$? = $ac_status" >&5
+  echo "$as_me:3639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3644: \$? = $ac_status" >&5
+  echo "$as_me:3645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
-cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5
@@ -3652,7 +3653,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3655: result: $INTEL_COMPILER" >&5
+		echo "$as_me:3656: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -3661,12 +3662,12 @@
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:3664: checking if this is really Clang C compiler" >&5
+	echo "$as_me:3665: 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 3669 "configure"
+#line 3670 "configure"
 #include "confdefs.h"
 
 int
@@ -3683,16 +3684,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3689: \$? = $ac_status" >&5
+  echo "$as_me:3690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3695: \$? = $ac_status" >&5
+  echo "$as_me:3696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
@@ -3703,12 +3704,12 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:3706: result: $CLANG_COMPILER" >&5
+	echo "$as_me:3707: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3711 "${as_me:-configure}"
+#line 3712 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3725,7 +3726,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:3728: checking for $CC warning options..." >&5
+	{ echo "$as_me:3729: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -3741,12 +3742,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3744: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3747: \$? = $ac_status" >&5
+  echo "$as_me:3748: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3749: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3750: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -3755,7 +3756,7 @@
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3758: checking for $CC warning options..." >&5
+	{ echo "$as_me:3759: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -3779,12 +3780,12 @@
 		Wundef $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3782: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3785: \$? = $ac_status" >&5
+  echo "$as_me:3786: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3787: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3788: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -3795,7 +3796,7 @@
 				[34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3798: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3799: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3805,7 +3806,7 @@
 				[12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3808: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3809: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3821,7 +3822,7 @@
 fi
 fi
 
-echo "$as_me:3824: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:3825: 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.
@@ -3838,7 +3839,7 @@
 else
   with_dbmalloc=
 fi;
-echo "$as_me:3841: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:3842: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -3863,7 +3864,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -3904,7 +3905,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -3932,23 +3933,23 @@
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:3935: checking for dbmalloc.h" >&5
+	echo "$as_me:3936: 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 3941 "configure"
+#line 3942 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3945: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3946: \"$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:3951: \$? = $ac_status" >&5
+  echo "$as_me:3952: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3967,11 +3968,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3970: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:3971: 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:3974: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:3975: 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
@@ -3979,7 +3980,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3982 "configure"
+#line 3983 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3998,16 +3999,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4004: \$? = $ac_status" >&5
+  echo "$as_me:4005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4010: \$? = $ac_status" >&5
+  echo "$as_me:4011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -4018,7 +4019,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4021: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:4022: 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
@@ -4033,7 +4034,7 @@
 
 fi
 
-echo "$as_me:4036: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:4037: 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.
@@ -4050,7 +4051,7 @@
 else
   with_dmalloc=
 fi;
-echo "$as_me:4053: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:4054: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -4075,7 +4076,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -4116,7 +4117,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -4144,23 +4145,23 @@
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:4147: checking for dmalloc.h" >&5
+	echo "$as_me:4148: 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 4153 "configure"
+#line 4154 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:4157: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4158: \"$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:4163: \$? = $ac_status" >&5
+  echo "$as_me:4164: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4179,11 +4180,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4182: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:4183: 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:4186: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:4187: 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
@@ -4191,7 +4192,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4194 "configure"
+#line 4195 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4210,16 +4211,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4216: \$? = $ac_status" >&5
+  echo "$as_me:4217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4222: \$? = $ac_status" >&5
+  echo "$as_me:4223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -4230,7 +4231,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4233: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:4234: 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
@@ -4270,7 +4271,7 @@
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:4273: checking for strcmp in -lc_s" >&5
+echo "$as_me:4274: 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
@@ -4278,7 +4279,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4281 "configure"
+#line 4282 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4297,16 +4298,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4301: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4303: \$? = $ac_status" >&5
+  echo "$as_me:4304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4309: \$? = $ac_status" >&5
+  echo "$as_me:4310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -4317,7 +4318,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4320: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:4321: 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
@@ -4388,7 +4389,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -4429,7 +4430,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -4479,14 +4480,14 @@
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in #(vi
 	cc|*/cc)
-		{ echo "$as_me:4482: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:4483: 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:4489: checking for $ac_word" >&5
+echo "$as_me:4490: 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
@@ -4501,7 +4502,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_prog"
-echo "$as_me:4504: found $ac_dir/$ac_word" >&5
+echo "$as_me:4505: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4509,10 +4510,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:4512: result: $CC" >&5
+  echo "$as_me:4513: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:4515: result: no" >&5
+  echo "$as_me:4516: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4535,23 +4536,23 @@
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4538: checking for $ac_header" >&5
+echo "$as_me:4539: 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 4544 "configure"
+#line 4545 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4548: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4549: \"$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:4554: \$? = $ac_status" >&5
+  echo "$as_me:4555: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4570,7 +4571,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4573: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4574: 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
@@ -4598,23 +4599,23 @@
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4601: checking for $ac_header" >&5
+echo "$as_me:4602: 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 4607 "configure"
+#line 4608 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4611: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4612: \"$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:4617: \$? = $ac_status" >&5
+  echo "$as_me:4618: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4633,7 +4634,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4636: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4637: 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
@@ -4660,13 +4661,13 @@
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
-echo "$as_me:4663: checking \$CC variable" >&5
+echo "$as_me:4664: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in #(vi
 *[\ \	]-[IUD]*)
-	echo "$as_me:4667: result: broken" >&5
+	echo "$as_me:4668: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:4669: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:4670: 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/^[^ 	]*[ 	]//'`
@@ -4687,7 +4688,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -4728,7 +4729,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -4752,12 +4753,12 @@
 
 	;;
 *)
-	echo "$as_me:4755: result: ok" >&5
+	echo "$as_me:4756: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:4760: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:4761: 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
@@ -4797,7 +4798,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -4838,7 +4839,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -4861,7 +4862,7 @@
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4864 "configure"
+#line 4865 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -4882,16 +4883,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4888: \$? = $ac_status" >&5
+  echo "$as_me:4889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4894: \$? = $ac_status" >&5
+  echo "$as_me:4895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -4904,7 +4905,7 @@
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:4907: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:4908: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -4925,7 +4926,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -4966,7 +4967,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -4998,7 +4999,7 @@
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:5001: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:5002: 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
@@ -5018,7 +5019,7 @@
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:5021: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:5022: 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
@@ -5030,7 +5031,7 @@
      	 # 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 5033 "configure"
+#line 5034 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5050,16 +5051,16 @@
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5056: \$? = $ac_status" >&5
+  echo "$as_me:5057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5062: \$? = $ac_status" >&5
+  echo "$as_me:5063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5069,16 +5070,16 @@
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5075: \$? = $ac_status" >&5
+  echo "$as_me:5076: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5081: \$? = $ac_status" >&5
+  echo "$as_me:5082: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -5092,13 +5093,13 @@
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:5095: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:5096: 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:5101: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:5102: 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
@@ -5106,7 +5107,7 @@
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5109 "configure"
+#line 5110 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5126,16 +5127,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5132: \$? = $ac_status" >&5
+  echo "$as_me:5133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5138: \$? = $ac_status" >&5
+  echo "$as_me:5139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5144,7 +5145,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5147 "configure"
+#line 5148 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -5165,16 +5166,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5171: \$? = $ac_status" >&5
+  echo "$as_me:5172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5177: \$? = $ac_status" >&5
+  echo "$as_me:5178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -5185,7 +5186,7 @@
   break
 done
 fi
-echo "$as_me:5188: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:5189: 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
 
@@ -5195,7 +5196,7 @@
 
 fi
 rm -rf conftest*
-  echo "$as_me:5198: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:5199: 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
@@ -5203,7 +5204,7 @@
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5206 "configure"
+#line 5207 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5223,16 +5224,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5226: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5229: \$? = $ac_status" >&5
+  echo "$as_me:5230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5235: \$? = $ac_status" >&5
+  echo "$as_me:5236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5241,7 +5242,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5244 "configure"
+#line 5245 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -5262,16 +5263,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5266: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5268: \$? = $ac_status" >&5
+  echo "$as_me:5269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5274: \$? = $ac_status" >&5
+  echo "$as_me:5275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -5282,7 +5283,7 @@
   break
 done
 fi
-echo "$as_me:5285: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:5286: 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
 
@@ -5295,7 +5296,7 @@
 fi
 
     if test "$enable_largefile" != no ; then
-	echo "$as_me:5298: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:5299: 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
@@ -5303,7 +5304,7 @@
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5306 "configure"
+#line 5307 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5315,16 +5316,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5321: \$? = $ac_status" >&5
+  echo "$as_me:5322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5327: \$? = $ac_status" >&5
+  echo "$as_me:5328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5333,7 +5334,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5336 "configure"
+#line 5337 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -5346,16 +5347,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5349: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5352: \$? = $ac_status" >&5
+  echo "$as_me:5353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5358: \$? = $ac_status" >&5
+  echo "$as_me:5359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -5366,7 +5367,7 @@
   break
 done
 fi
-echo "$as_me:5369: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:5370: 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
 
@@ -5380,13 +5381,13 @@
 # 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:5383: checking for fseeko" >&5
+echo "$as_me:5384: 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 5389 "configure"
+#line 5390 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5398,16 +5399,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5404: \$? = $ac_status" >&5
+  echo "$as_me:5405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5410: \$? = $ac_status" >&5
+  echo "$as_me:5411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -5417,7 +5418,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5420: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:5421: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -5438,14 +5439,14 @@
 	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:5441: checking whether to use struct dirent64" >&5
+	echo "$as_me:5442: 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 5448 "configure"
+#line 5449 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5466,16 +5467,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5472: \$? = $ac_status" >&5
+  echo "$as_me:5473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5478: \$? = $ac_status" >&5
+  echo "$as_me:5479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -5486,7 +5487,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5489: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:5490: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -5498,20 +5499,20 @@
 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:5501: checking for PATH separator" >&5
+	echo "$as_me:5502: 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:5508: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5509: 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:5514: checking for $ac_word" >&5
+echo "$as_me:5515: 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
@@ -5538,17 +5539,17 @@
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:5541: result: $MSGINIT" >&5
+  echo "$as_me:5542: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:5544: result: no" >&5
+  echo "$as_me:5545: 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}:5551: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:5552: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -5557,7 +5558,7 @@
 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:5560: checking for $ac_word" >&5
+echo "$as_me:5561: 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
@@ -5572,7 +5573,7 @@
   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:5575: found $ac_dir/$ac_word" >&5
+echo "$as_me:5576: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5580,10 +5581,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5583: result: $RANLIB" >&5
+  echo "$as_me:5584: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5586: result: no" >&5
+  echo "$as_me:5587: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5592,7 +5593,7 @@
   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:5595: checking for $ac_word" >&5
+echo "$as_me:5596: 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
@@ -5607,7 +5608,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:5610: found $ac_dir/$ac_word" >&5
+echo "$as_me:5611: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5616,10 +5617,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5619: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5620: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5622: result: no" >&5
+  echo "$as_me:5623: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5628,13 +5629,13 @@
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:5631: checking for ANSI C header files" >&5
+echo "$as_me:5632: 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 5637 "configure"
+#line 5638 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5642,13 +5643,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5645: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5646: \"$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:5651: \$? = $ac_status" >&5
+  echo "$as_me:5652: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5670,7 +5671,7 @@
 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 5673 "configure"
+#line 5674 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5688,7 +5689,7 @@
 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 5691 "configure"
+#line 5692 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5709,7 +5710,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5712 "configure"
+#line 5713 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5735,15 +5736,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5741: \$? = $ac_status" >&5
+  echo "$as_me:5742: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5746: \$? = $ac_status" >&5
+  echo "$as_me:5747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5756,7 +5757,7 @@
 fi
 fi
 fi
-echo "$as_me:5759: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5760: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5766,7 +5767,7 @@
 
 fi
 
-echo "$as_me:5769: checking for inline" >&5
+echo "$as_me:5770: 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
@@ -5774,7 +5775,7 @@
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 5777 "configure"
+#line 5778 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -5783,16 +5784,16 @@
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5787: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5789: \$? = $ac_status" >&5
+  echo "$as_me:5790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5795: \$? = $ac_status" >&5
+  echo "$as_me:5796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5803,7 +5804,7 @@
 done
 
 fi
-echo "$as_me:5806: result: $ac_cv_c_inline" >&5
+echo "$as_me:5807: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -5824,28 +5825,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5827: checking for $ac_header" >&5
+echo "$as_me:5828: 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 5833 "configure"
+#line 5834 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5840: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5842: \$? = $ac_status" >&5
+  echo "$as_me:5843: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5848: \$? = $ac_status" >&5
+  echo "$as_me:5849: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5855,7 +5856,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5858: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5859: 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
@@ -5865,13 +5866,13 @@
 fi
 done
 
-echo "$as_me:5868: checking for off_t" >&5
+echo "$as_me:5869: 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 5874 "configure"
+#line 5875 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5886,16 +5887,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5892: \$? = $ac_status" >&5
+  echo "$as_me:5893: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5898: \$? = $ac_status" >&5
+  echo "$as_me:5899: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5905,7 +5906,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5908: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5909: 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
   :
@@ -5917,13 +5918,13 @@
 
 fi
 
-echo "$as_me:5920: checking for size_t" >&5
+echo "$as_me:5921: 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 5926 "configure"
+#line 5927 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5938,16 +5939,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5944: \$? = $ac_status" >&5
+  echo "$as_me:5945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5950: \$? = $ac_status" >&5
+  echo "$as_me:5951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -5957,7 +5958,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5960: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5961: 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
   :
@@ -5971,13 +5972,13 @@
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:5974: checking for working alloca.h" >&5
+echo "$as_me:5975: 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 5980 "configure"
+#line 5981 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -5989,16 +5990,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5995: \$? = $ac_status" >&5
+  echo "$as_me:5996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6001: \$? = $ac_status" >&5
+  echo "$as_me:6002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -6008,7 +6009,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6011: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:6012: 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
 
@@ -6018,13 +6019,13 @@
 
 fi
 
-echo "$as_me:6021: checking for alloca" >&5
+echo "$as_me:6022: 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 6027 "configure"
+#line 6028 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -6056,16 +6057,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6062: \$? = $ac_status" >&5
+  echo "$as_me:6063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6068: \$? = $ac_status" >&5
+  echo "$as_me:6069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -6075,7 +6076,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6078: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:6079: 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
@@ -6096,13 +6097,13 @@
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:6099: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:6100: 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 6105 "configure"
+#line 6106 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6120,18 +6121,18 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:6123: result: $ac_cv_os_cray" >&5
+echo "$as_me:6124: 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:6128: checking for $ac_func" >&5
+echo "$as_me:6129: 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 6134 "configure"
+#line 6135 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6162,16 +6163,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6168: \$? = $ac_status" >&5
+  echo "$as_me:6169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6174: \$? = $ac_status" >&5
+  echo "$as_me:6175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6181,7 +6182,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6184: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6185: 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
 
@@ -6195,7 +6196,7 @@
   done
 fi
 
-echo "$as_me:6198: checking stack direction for C alloca" >&5
+echo "$as_me:6199: 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
@@ -6204,7 +6205,7 @@
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6207 "configure"
+#line 6208 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -6227,15 +6228,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6233: \$? = $ac_status" >&5
+  echo "$as_me:6234: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6238: \$? = $ac_status" >&5
+  echo "$as_me:6239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -6247,7 +6248,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6250: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:6251: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -6259,23 +6260,23 @@
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6262: checking for $ac_header" >&5
+echo "$as_me:6263: 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 6268 "configure"
+#line 6269 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6272: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6273: \"$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:6278: \$? = $ac_status" >&5
+  echo "$as_me:6279: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6294,7 +6295,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6297: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6298: 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
@@ -6307,13 +6308,13 @@
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6310: checking for $ac_func" >&5
+echo "$as_me:6311: 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 6316 "configure"
+#line 6317 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6344,16 +6345,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6350: \$? = $ac_status" >&5
+  echo "$as_me:6351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6356: \$? = $ac_status" >&5
+  echo "$as_me:6357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6363,7 +6364,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6366: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6367: 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
@@ -6373,7 +6374,7 @@
 fi
 done
 
-echo "$as_me:6376: checking for working mmap" >&5
+echo "$as_me:6377: 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
@@ -6382,7 +6383,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6385 "configure"
+#line 6386 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6509,15 +6510,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6515: \$? = $ac_status" >&5
+  echo "$as_me:6516: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6520: \$? = $ac_status" >&5
+  echo "$as_me:6521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6529,7 +6530,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6532: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:6533: 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
 
@@ -6540,13 +6541,13 @@
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:6543: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:6544: 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 6549 "configure"
+#line 6550 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -6566,7 +6567,7 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:6569: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:6570: 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"
@@ -6579,7 +6580,7 @@
 : ${CONFIG_H:=config.h}
 
 if test -z "$PACKAGE" ; then
-	{ { echo "$as_me:6582: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:6583: 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
@@ -6596,23 +6597,23 @@
 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:6599: checking for $ac_header" >&5
+echo "$as_me:6600: 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 6605 "configure"
+#line 6606 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6609: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6610: \"$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:6615: \$? = $ac_status" >&5
+  echo "$as_me:6616: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6631,7 +6632,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6634: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6635: 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
@@ -6646,13 +6647,13 @@
 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:6649: checking for $ac_func" >&5
+echo "$as_me:6650: 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 6655 "configure"
+#line 6656 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6683,16 +6684,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6689: \$? = $ac_status" >&5
+  echo "$as_me:6690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6695: \$? = $ac_status" >&5
+  echo "$as_me:6696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6702,7 +6703,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6705: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6706: 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
@@ -6750,7 +6751,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6753 "configure"
+#line 6754 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6762,16 +6763,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6766: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6768: \$? = $ac_status" >&5
+  echo "$as_me:6769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6774: \$? = $ac_status" >&5
+  echo "$as_me:6775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6788,7 +6789,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6791: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6792: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6829,7 +6830,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6832 "configure"
+#line 6833 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6841,16 +6842,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6847: \$? = $ac_status" >&5
+  echo "$as_me:6848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6853: \$? = $ac_status" >&5
+  echo "$as_me:6854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6867,7 +6868,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6870: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6871: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6883,7 +6884,7 @@
 fi
 
 	else
-{ { echo "$as_me:6886: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6887: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6908,7 +6909,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6911: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6912: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6937,7 +6938,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:6940: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6941: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6946,7 +6947,7 @@
 fi
 
 	else
-{ { echo "$as_me:6949: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6950: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6957,7 +6958,7 @@
 
 fi;
 
-  echo "$as_me:6960: checking for iconv" >&5
+  echo "$as_me:6961: 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
@@ -6968,12 +6969,12 @@
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:6971: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6972: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6976 "configure"
+#line 6977 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6992,16 +6993,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6998: \$? = $ac_status" >&5
+  echo "$as_me:6999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7004: \$? = $ac_status" >&5
+  echo "$as_me:7005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7015,7 +7016,7 @@
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7018 "configure"
+#line 7019 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7034,16 +7035,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7040: \$? = $ac_status" >&5
+  echo "$as_me:7041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7046: \$? = $ac_status" >&5
+  echo "$as_me:7047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7060,9 +7061,9 @@
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:7063: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:7064: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:7065: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7066: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7099,17 +7100,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/iconv &&       cf_search="$cf_search /usr/include/iconv"
-	test -d /usr/include/iconv/include &&    cf_search="$cf_search /usr/include/iconv/include"
-	test -d /usr/iconv/include &&       cf_search="$cf_search /usr/iconv/include"
-	test -d /usr/iconv/include/iconv &&    cf_search="$cf_search /usr/iconv/include/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -7121,39 +7111,28 @@
 	test -d $prefix/iconv/include/iconv &&    cf_search="$cf_search $prefix/iconv/include/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/iconv &&       cf_search="$cf_search /usr/local/include/iconv"
-	test -d /usr/local/include/iconv/include &&    cf_search="$cf_search /usr/local/include/iconv/include"
-	test -d /usr/local/iconv/include &&       cf_search="$cf_search /usr/local/iconv/include"
-	test -d /usr/local/iconv/include/iconv &&    cf_search="$cf_search /usr/local/iconv/include/iconv"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/iconv &&       cf_search="$cf_search /opt/include/iconv"
-	test -d /opt/include/iconv/include &&    cf_search="$cf_search /opt/include/iconv/include"
-	test -d /opt/iconv/include &&       cf_search="$cf_search /opt/iconv/include"
-	test -d /opt/iconv/include/iconv &&    cf_search="$cf_search /opt/iconv/include/iconv"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/iconv &&       cf_search="$cf_search $HOME/include/iconv"
-	test -d $HOME/include/iconv/include &&    cf_search="$cf_search $HOME/include/iconv/include"
-	test -d $HOME/iconv/include &&       cf_search="$cf_search $HOME/iconv/include"
-	test -d $HOME/iconv/include/iconv &&    cf_search="$cf_search $HOME/iconv/include/iconv"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/iconv &&       cf_search="$cf_search $cf_subdir_prefix/include/iconv"
+	test -d $cf_subdir_prefix/include/iconv/include &&    cf_search="$cf_search $cf_subdir_prefix/include/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include &&       cf_search="$cf_search $cf_subdir_prefix/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -7175,11 +7154,11 @@
       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}:7178: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7157: 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 7182 "configure"
+#line 7161 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7198,21 +7177,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7204: \$? = $ac_status" >&5
+  echo "$as_me:7183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7210: \$? = $ac_status" >&5
+  echo "$as_me:7189: \$? = $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}:7215: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7194: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7230,7 +7209,7 @@
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:7233: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7212: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -7265,17 +7244,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/iconv &&       cf_search="$cf_search /usr/lib/iconv"
-	test -d /usr/lib/iconv/lib &&    cf_search="$cf_search /usr/lib/iconv/lib"
-	test -d /usr/iconv/lib &&       cf_search="$cf_search /usr/iconv/lib"
-	test -d /usr/iconv/lib/iconv &&    cf_search="$cf_search /usr/iconv/lib/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -7287,39 +7255,28 @@
 	test -d $prefix/iconv/lib/iconv &&    cf_search="$cf_search $prefix/iconv/lib/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/iconv &&       cf_search="$cf_search /usr/local/lib/iconv"
-	test -d /usr/local/lib/iconv/lib &&    cf_search="$cf_search /usr/local/lib/iconv/lib"
-	test -d /usr/local/iconv/lib &&       cf_search="$cf_search /usr/local/iconv/lib"
-	test -d /usr/local/iconv/lib/iconv &&    cf_search="$cf_search /usr/local/iconv/lib/iconv"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/iconv &&       cf_search="$cf_search /opt/lib/iconv"
-	test -d /opt/lib/iconv/lib &&    cf_search="$cf_search /opt/lib/iconv/lib"
-	test -d /opt/iconv/lib &&       cf_search="$cf_search /opt/iconv/lib"
-	test -d /opt/iconv/lib/iconv &&    cf_search="$cf_search /opt/iconv/lib/iconv"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/iconv &&       cf_search="$cf_search $HOME/lib/iconv"
-	test -d $HOME/lib/iconv/lib &&    cf_search="$cf_search $HOME/lib/iconv/lib"
-	test -d $HOME/iconv/lib &&       cf_search="$cf_search $HOME/iconv/lib"
-	test -d $HOME/iconv/lib/iconv &&    cf_search="$cf_search $HOME/iconv/lib/iconv"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/iconv &&       cf_search="$cf_search $cf_subdir_prefix/lib/iconv"
+	test -d $cf_subdir_prefix/lib/iconv/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib &&       cf_search="$cf_search $cf_subdir_prefix/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_iconv in $cf_search
@@ -7327,13 +7284,13 @@
           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}:7330: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7287: 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 7336 "configure"
+#line 7293 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7352,21 +7309,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7358: \$? = $ac_status" >&5
+  echo "$as_me:7315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7364: \$? = $ac_status" >&5
+  echo "$as_me:7321: \$? = $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}:7369: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7326: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -7406,7 +7363,7 @@
 fi
 
 fi
-echo "$as_me:7409: result: $am_cv_func_iconv" >&5
+echo "$as_me:7366: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -7415,14 +7372,14 @@
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:7418: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:7375: 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 7425 "configure"
+#line 7382 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7447,16 +7404,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7453: \$? = $ac_status" >&5
+  echo "$as_me:7410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7459: \$? = $ac_status" >&5
+  echo "$as_me:7416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -7466,7 +7423,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7469: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:7426: 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
@@ -7508,7 +7465,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7511 "configure"
+#line 7468 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7520,16 +7477,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7526: \$? = $ac_status" >&5
+  echo "$as_me:7483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7532: \$? = $ac_status" >&5
+  echo "$as_me:7489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7546,7 +7503,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7549: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7506: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7583,7 +7540,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7586: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7543: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -7594,13 +7551,13 @@
     fi
   fi
 
-  echo "$as_me:7597: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:7554: 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 7603 "configure"
+#line 7560 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -7612,16 +7569,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7618: \$? = $ac_status" >&5
+  echo "$as_me:7575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7624: \$? = $ac_status" >&5
+  echo "$as_me:7581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -7632,7 +7589,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7635: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:7592: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -7643,13 +7600,13 @@
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:7646: checking for LC_MESSAGES" >&5
+    echo "$as_me:7603: 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 7652 "configure"
+#line 7609 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -7661,16 +7618,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7667: \$? = $ac_status" >&5
+  echo "$as_me:7624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7673: \$? = $ac_status" >&5
+  echo "$as_me:7630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -7680,7 +7637,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7683: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:7640: 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
 
@@ -7690,7 +7647,7 @@
 
     fi
   fi
-   echo "$as_me:7693: checking whether NLS is requested" >&5
+   echo "$as_me:7650: 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.
@@ -7700,7 +7657,7 @@
 else
   USE_NLS=no
 fi;
-  echo "$as_me:7703: result: $USE_NLS" >&5
+  echo "$as_me:7660: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -7713,7 +7670,7 @@
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:7716: checking whether included gettext is requested" >&5
+    echo "$as_me:7673: 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.
@@ -7723,7 +7680,7 @@
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7726: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:7683: 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"
@@ -7731,8 +7688,24 @@
                         CATOBJEXT=NONE
 
       cf_save_LIBS_1="$LIBS"
-      LIBS="$LIBICONV $LIBS"
-      echo "$as_me:7735: checking for libintl.h and gettext()" >&5
+
+cf_add_libs="$LIBICONV"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+      echo "$as_me:7708: 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
@@ -7743,12 +7716,12 @@
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:7746: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7719: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7751 "configure"
+#line 7724 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7768,16 +7741,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7774: \$? = $ac_status" >&5
+  echo "$as_me:7747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7780: \$? = $ac_status" >&5
+  echo "$as_me:7753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7791,7 +7764,7 @@
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7794 "configure"
+#line 7767 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7811,16 +7784,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7817: \$? = $ac_status" >&5
+  echo "$as_me:7790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7823: \$? = $ac_status" >&5
+  echo "$as_me:7796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7837,9 +7810,9 @@
 
     test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:7840: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:7813: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:7842: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7815: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7876,17 +7849,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/intl &&       cf_search="$cf_search /usr/include/intl"
-	test -d /usr/include/intl/include &&    cf_search="$cf_search /usr/include/intl/include"
-	test -d /usr/intl/include &&       cf_search="$cf_search /usr/intl/include"
-	test -d /usr/intl/include/intl &&    cf_search="$cf_search /usr/intl/include/intl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -7898,39 +7860,28 @@
 	test -d $prefix/intl/include/intl &&    cf_search="$cf_search $prefix/intl/include/intl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/intl &&       cf_search="$cf_search /usr/local/include/intl"
-	test -d /usr/local/include/intl/include &&    cf_search="$cf_search /usr/local/include/intl/include"
-	test -d /usr/local/intl/include &&       cf_search="$cf_search /usr/local/intl/include"
-	test -d /usr/local/intl/include/intl &&    cf_search="$cf_search /usr/local/intl/include/intl"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/intl &&       cf_search="$cf_search /opt/include/intl"
-	test -d /opt/include/intl/include &&    cf_search="$cf_search /opt/include/intl/include"
-	test -d /opt/intl/include &&       cf_search="$cf_search /opt/intl/include"
-	test -d /opt/intl/include/intl &&    cf_search="$cf_search /opt/intl/include/intl"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/intl &&       cf_search="$cf_search $HOME/include/intl"
-	test -d $HOME/include/intl/include &&    cf_search="$cf_search $HOME/include/intl/include"
-	test -d $HOME/intl/include &&       cf_search="$cf_search $HOME/intl/include"
-	test -d $HOME/intl/include/intl &&    cf_search="$cf_search $HOME/intl/include/intl"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/intl &&       cf_search="$cf_search $cf_subdir_prefix/include/intl"
+	test -d $cf_subdir_prefix/include/intl/include &&    cf_search="$cf_search $cf_subdir_prefix/include/intl/include"
+	test -d $cf_subdir_prefix/intl/include &&       cf_search="$cf_search $cf_subdir_prefix/intl/include"
+	test -d $cf_subdir_prefix/intl/include/intl &&    cf_search="$cf_search $cf_subdir_prefix/intl/include/intl"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -7952,11 +7903,11 @@
       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}:7955: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7906: 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 7959 "configure"
+#line 7910 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7976,21 +7927,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7982: \$? = $ac_status" >&5
+  echo "$as_me:7933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7988: \$? = $ac_status" >&5
+  echo "$as_me:7939: \$? = $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}:7993: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7944: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8008,7 +7959,7 @@
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:8011: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7962: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -8043,17 +7994,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/intl &&       cf_search="$cf_search /usr/lib/intl"
-	test -d /usr/lib/intl/lib &&    cf_search="$cf_search /usr/lib/intl/lib"
-	test -d /usr/intl/lib &&       cf_search="$cf_search /usr/intl/lib"
-	test -d /usr/intl/lib/intl &&    cf_search="$cf_search /usr/intl/lib/intl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -8065,39 +8005,28 @@
 	test -d $prefix/intl/lib/intl &&    cf_search="$cf_search $prefix/intl/lib/intl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/intl &&       cf_search="$cf_search /usr/local/lib/intl"
-	test -d /usr/local/lib/intl/lib &&    cf_search="$cf_search /usr/local/lib/intl/lib"
-	test -d /usr/local/intl/lib &&       cf_search="$cf_search /usr/local/intl/lib"
-	test -d /usr/local/intl/lib/intl &&    cf_search="$cf_search /usr/local/intl/lib/intl"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/intl &&       cf_search="$cf_search /opt/lib/intl"
-	test -d /opt/lib/intl/lib &&    cf_search="$cf_search /opt/lib/intl/lib"
-	test -d /opt/intl/lib &&       cf_search="$cf_search /opt/intl/lib"
-	test -d /opt/intl/lib/intl &&    cf_search="$cf_search /opt/intl/lib/intl"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/intl &&       cf_search="$cf_search $HOME/lib/intl"
-	test -d $HOME/lib/intl/lib &&    cf_search="$cf_search $HOME/lib/intl/lib"
-	test -d $HOME/intl/lib &&       cf_search="$cf_search $HOME/intl/lib"
-	test -d $HOME/intl/lib/intl &&    cf_search="$cf_search $HOME/intl/lib/intl"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/intl &&       cf_search="$cf_search $cf_subdir_prefix/lib/intl"
+	test -d $cf_subdir_prefix/lib/intl/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/intl/lib"
+	test -d $cf_subdir_prefix/intl/lib &&       cf_search="$cf_search $cf_subdir_prefix/intl/lib"
+	test -d $cf_subdir_prefix/intl/lib/intl &&    cf_search="$cf_search $cf_subdir_prefix/intl/lib/intl"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_intl in $cf_search
@@ -8105,13 +8034,13 @@
           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}:8108: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8037: 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 8114 "configure"
+#line 8043 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8131,21 +8060,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8137: \$? = $ac_status" >&5
+  echo "$as_me:8066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8143: \$? = $ac_status" >&5
+  echo "$as_me:8072: \$? = $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}:8148: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8077: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -8185,7 +8114,7 @@
 fi
 
 fi
-echo "$as_me:8188: result: $cf_cv_func_gettext" >&5
+echo "$as_me:8117: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
       LIBS="$cf_save_LIBS_1"
 
@@ -8225,7 +8154,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8228 "configure"
+#line 8157 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8237,16 +8166,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8243: \$? = $ac_status" >&5
+  echo "$as_me:8172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8249: \$? = $ac_status" >&5
+  echo "$as_me:8178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8263,7 +8192,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8266: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8195: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8300,7 +8229,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8303: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8232: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $INTLLIBS"
       fi
@@ -8316,13 +8245,13 @@
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8319: checking for $ac_func" >&5
+echo "$as_me:8248: 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 8325 "configure"
+#line 8254 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8353,16 +8282,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8359: \$? = $ac_status" >&5
+  echo "$as_me:8288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8365: \$? = $ac_status" >&5
+  echo "$as_me:8294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8372,7 +8301,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8375: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8304: 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
@@ -8387,7 +8316,7 @@
                     # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:8390: checking for $ac_word" >&5
+echo "$as_me:8319: 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
@@ -8414,16 +8343,16 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8417: result: $MSGFMT" >&5
+  echo "$as_me:8346: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8420: result: no" >&5
+  echo "$as_me:8349: 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:8426: checking for $ac_word" >&5
+echo "$as_me:8355: 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
@@ -8440,7 +8369,7 @@
   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:8443: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8372: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8452,17 +8381,17 @@
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8455: result: $GMSGFMT" >&5
+  echo "$as_me:8384: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8458: result: no" >&5
+  echo "$as_me:8387: 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:8465: checking for $ac_word" >&5
+echo "$as_me:8394: 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
@@ -8489,10 +8418,10 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8492: result: $XGETTEXT" >&5
+  echo "$as_me:8421: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8495: result: no" >&5
+  echo "$as_me:8424: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8507,7 +8436,7 @@
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:8510: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:8439: 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
@@ -8515,7 +8444,7 @@
       # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:8518: checking for $ac_word" >&5
+echo "$as_me:8447: 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
@@ -8542,16 +8471,16 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8545: result: $MSGFMT" >&5
+  echo "$as_me:8474: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8548: result: no" >&5
+  echo "$as_me:8477: 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:8554: checking for $ac_word" >&5
+echo "$as_me:8483: 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
@@ -8568,7 +8497,7 @@
   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:8571: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8500: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8580,17 +8509,17 @@
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8583: result: $GMSGFMT" >&5
+  echo "$as_me:8512: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8586: result: no" >&5
+  echo "$as_me:8515: 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:8593: checking for $ac_word" >&5
+echo "$as_me:8522: 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
@@ -8617,10 +8546,10 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8620: result: $XGETTEXT" >&5
+  echo "$as_me:8549: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8623: result: no" >&5
+  echo "$as_me:8552: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8635,7 +8564,7 @@
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8638: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:8567: 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
@@ -8645,7 +8574,7 @@
                       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8648: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:8577: 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
@@ -8665,7 +8594,7 @@
 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:8668: checking for $ac_word" >&5
+echo "$as_me:8597: 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
@@ -8680,7 +8609,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:8683: found $ac_dir/$ac_word" >&5
+echo "$as_me:8612: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8688,10 +8617,10 @@
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:8691: result: $INTLBISON" >&5
+  echo "$as_me:8620: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:8694: result: no" >&5
+  echo "$as_me:8623: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8701,7 +8630,7 @@
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:8704: checking version of bison" >&5
+            echo "$as_me:8633: 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
@@ -8710,7 +8639,7 @@
            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:8713: result: $ac_prog_version" >&5
+    echo "$as_me:8642: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -8736,7 +8665,7 @@
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:8739: checking for catalogs to be installed" >&5
+       echo "$as_me:8668: 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
@@ -8756,7 +8685,7 @@
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:8759: result: $LINGUAS" >&5
+       echo "$as_me:8688: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8792,7 +8721,7 @@
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8795: checking if we should use included message-library" >&5
+echo "$as_me:8724: 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.
@@ -8803,7 +8732,7 @@
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8806: result: $use_our_messages" >&5
+echo "$as_me:8735: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -8845,23 +8774,23 @@
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8848: checking for $ac_header" >&5
+echo "$as_me:8777: 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 8854 "configure"
+#line 8783 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8858: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8787: \"$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:8864: \$? = $ac_status" >&5
+  echo "$as_me:8793: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8880,7 +8809,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8883: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8812: 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
@@ -8966,7 +8895,7 @@
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8969: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8898: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8975,7 +8904,7 @@
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:8978: checking if you want full utility pathnames" >&5
+echo "$as_me:8907: 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.
@@ -8992,14 +8921,14 @@
   with_full_paths=yes
 
 fi;
-echo "$as_me:8995: result: $with_full_paths" >&5
+echo "$as_me:8924: 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:9002: checking for system mailer" >&5
+echo "$as_me:8931: 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
@@ -9019,14 +8948,14 @@
 
 fi
 
-echo "$as_me:9022: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:8951: 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:9029: checking system mail flags" >&5
+echo "$as_me:8958: 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
@@ -9042,7 +8971,7 @@
 
 fi
 
-echo "$as_me:9045: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:8974: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -9093,14 +9022,14 @@
 	;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:9096: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9025: 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 9103 "configure"
+#line 9032 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9115,16 +9044,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9121: \$? = $ac_status" >&5
+  echo "$as_me:9050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9127: \$? = $ac_status" >&5
+  echo "$as_me:9056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9133,7 +9062,7 @@
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9136 "configure"
+#line 9065 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9148,16 +9077,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9154: \$? = $ac_status" >&5
+  echo "$as_me:9083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9160: \$? = $ac_status" >&5
+  echo "$as_me:9089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9172,11 +9101,14 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9175: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9104: 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"
 
 	;;
+minix*) #(vi
+	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+	;;
 mirbsd*) #(vi
 	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
 	cf_XOPEN_SOURCE=
@@ -9194,16 +9126,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:9197: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9129: 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}:9203: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9135: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9206 "configure"
+#line 9138 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9218,16 +9150,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9224: \$? = $ac_status" >&5
+  echo "$as_me:9156: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9230: \$? = $ac_status" >&5
+  echo "$as_me:9162: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9248,7 +9180,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9251 "configure"
+#line 9183 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9263,16 +9195,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9269: \$? = $ac_status" >&5
+  echo "$as_me:9201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9275: \$? = $ac_status" >&5
+  echo "$as_me:9207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9283,15 +9215,15 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9286: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9218: 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}:9291: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9223: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9294 "configure"
+#line 9226 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9306,16 +9238,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9309: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9312: \$? = $ac_status" >&5
+  echo "$as_me:9244: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9318: \$? = $ac_status" >&5
+  echo "$as_me:9250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9331,7 +9263,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9334: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9266: 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
@@ -9353,7 +9285,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -9394,7 +9326,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -9441,17 +9373,22 @@
 	;;
 solaris2.*) #(vi
 	cf_xopen_source="-D__EXTENSIONS__"
+	cf_cv_xopen_source=broken
+	;;
+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
+	cf_XOPEN_SOURCE=
+	cf_POSIX_C_SOURCE=
 	;;
 *)
 
-echo "$as_me:9447: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9384: 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 9454 "configure"
+#line 9391 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9470,16 +9407,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9410: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9476: \$? = $ac_status" >&5
+  echo "$as_me:9413: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9482: \$? = $ac_status" >&5
+  echo "$as_me:9419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9488,7 +9425,7 @@
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9491 "configure"
+#line 9428 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9507,16 +9444,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9513: \$? = $ac_status" >&5
+  echo "$as_me:9450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9519: \$? = $ac_status" >&5
+  echo "$as_me:9456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9531,7 +9468,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9534: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9471: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9561,7 +9498,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -9602,7 +9539,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -9639,16 +9576,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:9642: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9579: 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}:9648: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9585: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9651 "configure"
+#line 9588 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9663,16 +9600,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9669: \$? = $ac_status" >&5
+  echo "$as_me:9606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9675: \$? = $ac_status" >&5
+  echo "$as_me:9612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9693,7 +9630,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9696 "configure"
+#line 9633 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9708,16 +9645,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9714: \$? = $ac_status" >&5
+  echo "$as_me:9651: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9720: \$? = $ac_status" >&5
+  echo "$as_me:9657: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9728,15 +9665,15 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9731: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9668: 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}:9736: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9673: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9739 "configure"
+#line 9676 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9751,16 +9688,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9757: \$? = $ac_status" >&5
+  echo "$as_me:9694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9763: \$? = $ac_status" >&5
+  echo "$as_me:9700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9776,7 +9713,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9779: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9716: 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
@@ -9798,7 +9735,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -9839,7 +9776,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -9883,7 +9820,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -9924,7 +9861,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -9932,16 +9869,25 @@
 done
 
 if test -n "$cf_new_cflags" ; then
+	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+
+echo "${as_me:-configure}:9874: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	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}:9882: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	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}:9890: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
@@ -9949,10 +9895,10 @@
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:9952: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:9898: 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 9955 "configure"
+#line 9901 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9967,16 +9913,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9973: \$? = $ac_status" >&5
+  echo "$as_me:9919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9979: \$? = $ac_status" >&5
+  echo "$as_me:9925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -9985,12 +9931,12 @@
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:9988: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:9934: 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 9993 "configure"
+#line 9939 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10005,16 +9951,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10011: \$? = $ac_status" >&5
+  echo "$as_me:9957: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10017: \$? = $ac_status" >&5
+  echo "$as_me:9963: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -10025,19 +9971,19 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:10028: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:9974: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:10033: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9979: 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 10040 "configure"
+#line 9986 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10056,16 +10002,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10062: \$? = $ac_status" >&5
+  echo "$as_me:10008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10068: \$? = $ac_status" >&5
+  echo "$as_me:10014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10074,7 +10020,7 @@
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10077 "configure"
+#line 10023 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10093,16 +10039,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10099: \$? = $ac_status" >&5
+  echo "$as_me:10045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10105: \$? = $ac_status" >&5
+  echo "$as_me:10051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10117,7 +10063,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10120: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10066: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -10147,7 +10093,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -10188,7 +10134,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -10215,14 +10161,14 @@
 	fi
 fi
 
-echo "$as_me:10218: checking if SIGWINCH is defined" >&5
+echo "$as_me:10164: 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 10225 "configure"
+#line 10171 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10237,23 +10183,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10243: \$? = $ac_status" >&5
+  echo "$as_me:10189: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10249: \$? = $ac_status" >&5
+  echo "$as_me:10195: \$? = $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 10256 "configure"
+#line 10202 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10271,16 +10217,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10277: \$? = $ac_status" >&5
+  echo "$as_me:10223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10283: \$? = $ac_status" >&5
+  echo "$as_me:10229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -10294,11 +10240,11 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10297: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:10243: 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:10301: checking for actual SIGWINCH definition" >&5
+echo "$as_me:10247: 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
@@ -10309,7 +10255,7 @@
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10312 "configure"
+#line 10258 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10331,16 +10277,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10337: \$? = $ac_status" >&5
+  echo "$as_me:10283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10343: \$? = $ac_status" >&5
+  echo "$as_me:10289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -10354,7 +10300,7 @@
 done
 
 fi
-echo "$as_me:10357: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:10303: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10366,7 +10312,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10369: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10315: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -10386,7 +10332,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -10427,7 +10373,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -10437,7 +10383,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:10440: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10386: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -10445,7 +10391,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:10448: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10394: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -10453,14 +10399,14 @@
 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}:10456: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10402: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-if test "$cf_check_cflags" != "$CFLAGS" ; then
+if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 10463 "configure"
+#line 10409 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10472,16 +10418,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10478: \$? = $ac_status" >&5
+  echo "$as_me:10424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10484: \$? = $ac_status" >&5
+  echo "$as_me:10430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10489,12 +10435,12 @@
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10492: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10438: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
-	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:10497: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10443: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -10506,7 +10452,7 @@
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:10509: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:10455: 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
@@ -10521,10 +10467,10 @@
 fi;
 
 fi
-echo "$as_me:10524: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:10470: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:10527: checking if you want ssl library" >&5
+echo "$as_me:10473: 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
@@ -10539,10 +10485,10 @@
 fi;
 
 fi
-echo "$as_me:10542: result: $cf_cv_use_libssl" >&5
+echo "$as_me:10488: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:10545: checking if you want gnutls support" >&5
+echo "$as_me:10491: 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
@@ -10557,11 +10503,11 @@
 fi;
 
 fi
-echo "$as_me:10560: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:10506: 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:10564: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:10510: 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
@@ -10576,10 +10522,10 @@
 fi;
 
 fi
-echo "$as_me:10579: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:10525: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:10582: checking if you want socks library" >&5
+echo "$as_me:10528: 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
@@ -10594,10 +10540,10 @@
 fi;
 
 fi
-echo "$as_me:10597: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:10543: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:10600: checking if you want socks5 library" >&5
+echo "$as_me:10546: 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
@@ -10612,7 +10558,7 @@
 fi;
 
 fi
-echo "$as_me:10615: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:10561: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -10651,7 +10597,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10654 "configure"
+#line 10600 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10663,16 +10609,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10669: \$? = $ac_status" >&5
+  echo "$as_me:10615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10675: \$? = $ac_status" >&5
+  echo "$as_me:10621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10689,7 +10635,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10692: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10638: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10730,7 +10676,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10733 "configure"
+#line 10679 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10742,16 +10688,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10748: \$? = $ac_status" >&5
+  echo "$as_me:10694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10754: \$? = $ac_status" >&5
+  echo "$as_me:10700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10768,7 +10714,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10771: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10717: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10784,7 +10730,7 @@
 fi
 
 	else
-{ { echo "$as_me:10787: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10733: 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
@@ -10809,7 +10755,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:10812: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10758: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10838,7 +10784,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:10841: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10787: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10847,7 +10793,7 @@
 fi
 
 	else
-{ { echo "$as_me:10850: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10796: 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
@@ -10861,12 +10807,12 @@
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:10864: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10810: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10869 "configure"
+#line 10815 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10882,16 +10828,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10888: \$? = $ac_status" >&5
+  echo "$as_me:10834: \$? = $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:10837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10894: \$? = $ac_status" >&5
+  echo "$as_me:10840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10905,7 +10851,7 @@
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10908 "configure"
+#line 10854 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10921,16 +10867,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10927: \$? = $ac_status" >&5
+  echo "$as_me:10873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10933: \$? = $ac_status" >&5
+  echo "$as_me:10879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10947,9 +10893,9 @@
 
     test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:10950: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:10896: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:10952: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10898: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10986,17 +10932,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/socks &&       cf_search="$cf_search /usr/include/socks"
-	test -d /usr/include/socks/include &&    cf_search="$cf_search /usr/include/socks/include"
-	test -d /usr/socks/include &&       cf_search="$cf_search /usr/socks/include"
-	test -d /usr/socks/include/socks &&    cf_search="$cf_search /usr/socks/include/socks"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -11008,39 +10943,28 @@
 	test -d $prefix/socks/include/socks &&    cf_search="$cf_search $prefix/socks/include/socks"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/socks &&       cf_search="$cf_search /usr/local/include/socks"
-	test -d /usr/local/include/socks/include &&    cf_search="$cf_search /usr/local/include/socks/include"
-	test -d /usr/local/socks/include &&       cf_search="$cf_search /usr/local/socks/include"
-	test -d /usr/local/socks/include/socks &&    cf_search="$cf_search /usr/local/socks/include/socks"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/socks &&       cf_search="$cf_search /opt/include/socks"
-	test -d /opt/include/socks/include &&    cf_search="$cf_search /opt/include/socks/include"
-	test -d /opt/socks/include &&       cf_search="$cf_search /opt/socks/include"
-	test -d /opt/socks/include/socks &&    cf_search="$cf_search /opt/socks/include/socks"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/socks &&       cf_search="$cf_search $HOME/include/socks"
-	test -d $HOME/include/socks/include &&    cf_search="$cf_search $HOME/include/socks/include"
-	test -d $HOME/socks/include &&       cf_search="$cf_search $HOME/socks/include"
-	test -d $HOME/socks/include/socks &&    cf_search="$cf_search $HOME/socks/include/socks"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/socks &&       cf_search="$cf_search $cf_subdir_prefix/include/socks"
+	test -d $cf_subdir_prefix/include/socks/include &&    cf_search="$cf_search $cf_subdir_prefix/include/socks/include"
+	test -d $cf_subdir_prefix/socks/include &&       cf_search="$cf_search $cf_subdir_prefix/socks/include"
+	test -d $cf_subdir_prefix/socks/include/socks &&    cf_search="$cf_search $cf_subdir_prefix/socks/include/socks"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -11062,11 +10986,11 @@
       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}:11065: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:10989: 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 11069 "configure"
+#line 10993 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11082,21 +11006,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11088: \$? = $ac_status" >&5
+  echo "$as_me:11012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11094: \$? = $ac_status" >&5
+  echo "$as_me:11018: \$? = $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}:11099: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11023: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11114,7 +11038,7 @@
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:11117: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11041: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -11149,17 +11073,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/socks &&       cf_search="$cf_search /usr/lib/socks"
-	test -d /usr/lib/socks/lib &&    cf_search="$cf_search /usr/lib/socks/lib"
-	test -d /usr/socks/lib &&       cf_search="$cf_search /usr/socks/lib"
-	test -d /usr/socks/lib/socks &&    cf_search="$cf_search /usr/socks/lib/socks"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -11171,39 +11084,28 @@
 	test -d $prefix/socks/lib/socks &&    cf_search="$cf_search $prefix/socks/lib/socks"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/socks &&       cf_search="$cf_search /usr/local/lib/socks"
-	test -d /usr/local/lib/socks/lib &&    cf_search="$cf_search /usr/local/lib/socks/lib"
-	test -d /usr/local/socks/lib &&       cf_search="$cf_search /usr/local/socks/lib"
-	test -d /usr/local/socks/lib/socks &&    cf_search="$cf_search /usr/local/socks/lib/socks"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/socks &&       cf_search="$cf_search /opt/lib/socks"
-	test -d /opt/lib/socks/lib &&    cf_search="$cf_search /opt/lib/socks/lib"
-	test -d /opt/socks/lib &&       cf_search="$cf_search /opt/socks/lib"
-	test -d /opt/socks/lib/socks &&    cf_search="$cf_search /opt/socks/lib/socks"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/socks &&       cf_search="$cf_search $HOME/lib/socks"
-	test -d $HOME/lib/socks/lib &&    cf_search="$cf_search $HOME/lib/socks/lib"
-	test -d $HOME/socks/lib &&       cf_search="$cf_search $HOME/socks/lib"
-	test -d $HOME/socks/lib/socks &&    cf_search="$cf_search $HOME/socks/lib/socks"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/socks &&       cf_search="$cf_search $cf_subdir_prefix/lib/socks"
+	test -d $cf_subdir_prefix/lib/socks/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/socks/lib"
+	test -d $cf_subdir_prefix/socks/lib &&       cf_search="$cf_search $cf_subdir_prefix/socks/lib"
+	test -d $cf_subdir_prefix/socks/lib/socks &&    cf_search="$cf_search $cf_subdir_prefix/socks/lib/socks"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_socks in $cf_search
@@ -11211,13 +11113,13 @@
           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}:11214: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11116: 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 11220 "configure"
+#line 11122 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11233,21 +11135,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11239: \$? = $ac_status" >&5
+  echo "$as_me:11141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11245: \$? = $ac_status" >&5
+  echo "$as_me:11147: \$? = $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}:11250: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11152: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -11306,7 +11208,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11309 "configure"
+#line 11211 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11318,16 +11220,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11324: \$? = $ac_status" >&5
+  echo "$as_me:11226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11330: \$? = $ac_status" >&5
+  echo "$as_me:11232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11344,7 +11246,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11347: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11249: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11378,7 +11280,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11381: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11283: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11386,10 +11288,24 @@
   done
 fi
 
-	LIBS="-lsocks $LIBS"
+cf_add_libs="-lsocks"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:11392: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:11308: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -11432,7 +11348,7 @@
 EOF
 
   else
-    { { echo "$as_me:11435: error: cannot link with socks library" >&5
+    { { echo "$as_me:11351: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11473,7 +11389,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11476 "configure"
+#line 11392 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11485,16 +11401,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11491: \$? = $ac_status" >&5
+  echo "$as_me:11407: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11497: \$? = $ac_status" >&5
+  echo "$as_me:11413: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11511,7 +11427,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11514: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11430: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11552,7 +11468,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11555 "configure"
+#line 11471 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11564,16 +11480,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11570: \$? = $ac_status" >&5
+  echo "$as_me:11486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11576: \$? = $ac_status" >&5
+  echo "$as_me:11492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11590,7 +11506,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11593: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11509: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11606,7 +11522,7 @@
 fi
 
 	else
-{ { echo "$as_me:11609: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11525: 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
@@ -11631,7 +11547,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11634: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11550: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11660,7 +11576,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11663: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11579: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11669,7 +11585,7 @@
 fi
 
 	else
-{ { echo "$as_me:11672: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11588: 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
@@ -11678,7 +11594,21 @@
       ;;
   esac
 
-LIBS="-lsocks5 $LIBS"
+cf_add_libs="-lsocks5"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 cat >>confdefs.h <<\EOF
 #define USE_SOCKS5 1
@@ -11688,11 +11618,11 @@
 #define SOCKS 1
 EOF
 
-echo "$as_me:11691: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:11621: 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 11695 "configure"
+#line 11625 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -11706,16 +11636,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11712: \$? = $ac_status" >&5
+  echo "$as_me:11642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11718: \$? = $ac_status" >&5
+  echo "$as_me:11648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -11727,7 +11657,7 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 11730 "configure"
+#line 11660 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -11739,29 +11669,29 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11745: \$? = $ac_status" >&5
+  echo "$as_me:11675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11751: \$? = $ac_status" >&5
+  echo "$as_me:11681: \$? = $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:11757: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:11687: 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:11764: result: $cf_use_socks4" >&5
+echo "$as_me:11694: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -11816,10 +11746,10 @@
 
 fi
 
-echo "$as_me:11819: checking if socks5p.h is available" >&5
+echo "$as_me:11749: 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 11822 "configure"
+#line 11752 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -11834,16 +11764,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11840: \$? = $ac_status" >&5
+  echo "$as_me:11770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11846: \$? = $ac_status" >&5
+  echo "$as_me:11776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -11852,7 +11782,7 @@
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:11855: result: $cf_use_socks5p_h" >&5
+echo "$as_me:11785: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -11864,14 +11794,14 @@
 
 cf_test_netlibs=no
 
-echo "$as_me:11867: checking for network libraries" >&5
+echo "$as_me:11797: 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:11874: result: working..." >&5
+echo "$as_me:11804: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -11883,23 +11813,23 @@
 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:11886: checking for $ac_header" >&5
+echo "$as_me:11816: 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 11892 "configure"
+#line 11822 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11896: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11826: \"$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:11902: \$? = $ac_status" >&5
+  echo "$as_me:11832: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11918,7 +11848,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11921: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11851: 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
@@ -11935,10 +11865,25 @@
 	fi
 
 	cf_save_LIBS="$LIBS"
-	LIBS="$cf_winsock_lib $LIBS"
+
+cf_add_libs="$cf_winsock_lib"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11941 "configure"
+#line 11886 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -11965,22 +11910,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11971: \$? = $ac_status" >&5
+  echo "$as_me:11916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11977: \$? = $ac_status" >&5
+  echo "$as_me:11922: \$? = $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:11983: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:11928: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11993,13 +11938,13 @@
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11996: checking for $ac_func" >&5
+echo "$as_me:11941: 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 12002 "configure"
+#line 11947 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12030,16 +11975,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12036: \$? = $ac_status" >&5
+  echo "$as_me:11981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12042: \$? = $ac_status" >&5
+  echo "$as_me:11987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12049,7 +11994,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12052: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11997: 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
@@ -12058,7 +12003,7 @@
 
 else
 
-echo "$as_me:12061: checking for gethostname in -lnsl" >&5
+echo "$as_me:12006: 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
@@ -12066,7 +12011,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12069 "configure"
+#line 12014 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12085,16 +12030,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12088: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12091: \$? = $ac_status" >&5
+  echo "$as_me:12036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12097: \$? = $ac_status" >&5
+  echo "$as_me:12042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -12105,7 +12050,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12108: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:12053: 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
 
@@ -12122,7 +12067,7 @@
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:12125: checking for gethostname in -lsocket" >&5
+echo "$as_me:12070: 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
@@ -12130,7 +12075,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12133 "configure"
+#line 12078 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12149,16 +12094,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12155: \$? = $ac_status" >&5
+  echo "$as_me:12100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12161: \$? = $ac_status" >&5
+  echo "$as_me:12106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -12169,7 +12114,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12172: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:12117: 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
 
@@ -12193,7 +12138,7 @@
 fi
 done
 
-	echo "$as_me:12196: checking for main in -linet" >&5
+	echo "$as_me:12141: 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
@@ -12201,7 +12146,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12204 "configure"
+#line 12149 "configure"
 #include "confdefs.h"
 
 int
@@ -12213,16 +12158,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12219: \$? = $ac_status" >&5
+  echo "$as_me:12164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12225: \$? = $ac_status" >&5
+  echo "$as_me:12170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -12233,7 +12178,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12236: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:12181: 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"
@@ -12244,13 +12189,13 @@
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12247: checking for $ac_func" >&5
+echo "$as_me:12192: 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 12253 "configure"
+#line 12198 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12281,16 +12226,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12287: \$? = $ac_status" >&5
+  echo "$as_me:12232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12300,7 +12245,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12303: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12248: 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
@@ -12309,7 +12254,7 @@
 
 else
 
-echo "$as_me:12312: checking for socket in -lsocket" >&5
+echo "$as_me:12257: 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
@@ -12317,7 +12262,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12320 "configure"
+#line 12265 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12336,16 +12281,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12342: \$? = $ac_status" >&5
+  echo "$as_me:12287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12348: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -12356,7 +12301,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12359: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:12304: 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
 
@@ -12373,7 +12318,7 @@
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:12376: checking for socket in -lbsd" >&5
+echo "$as_me:12321: 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
@@ -12381,7 +12326,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12384 "configure"
+#line 12329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12400,16 +12345,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12406: \$? = $ac_status" >&5
+  echo "$as_me:12351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12412: \$? = $ac_status" >&5
+  echo "$as_me:12357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -12420,7 +12365,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12423: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:12368: 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
 
@@ -12449,13 +12394,13 @@
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12452: checking for $ac_func" >&5
+echo "$as_me:12397: 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 12458 "configure"
+#line 12403 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12486,16 +12431,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12492: \$? = $ac_status" >&5
+  echo "$as_me:12437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12498: \$? = $ac_status" >&5
+  echo "$as_me:12443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12505,7 +12450,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12508: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12453: 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
@@ -12514,7 +12459,7 @@
 
 else
 
-echo "$as_me:12517: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:12462: 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
@@ -12522,7 +12467,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12525 "configure"
+#line 12470 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12541,16 +12486,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12547: \$? = $ac_status" >&5
+  echo "$as_me:12492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12553: \$? = $ac_status" >&5
+  echo "$as_me:12498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12561,7 +12506,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12564: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12509: 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
 
@@ -12586,13 +12531,13 @@
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12589: checking for $ac_func" >&5
+echo "$as_me:12534: 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 12595 "configure"
+#line 12540 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12623,16 +12568,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12629: \$? = $ac_status" >&5
+  echo "$as_me:12574: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12635: \$? = $ac_status" >&5
+  echo "$as_me:12580: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12642,7 +12587,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12645: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12590: 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
@@ -12651,7 +12596,7 @@
 
 else
 
-echo "$as_me:12654: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:12599: 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
@@ -12659,7 +12604,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12662 "configure"
+#line 12607 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12678,16 +12623,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12684: \$? = $ac_status" >&5
+  echo "$as_me:12629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12690: \$? = $ac_status" >&5
+  echo "$as_me:12635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -12698,7 +12643,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12701: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:12646: 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
 
@@ -12723,13 +12668,13 @@
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12726: checking for $ac_func" >&5
+echo "$as_me:12671: 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 12732 "configure"
+#line 12677 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12760,16 +12705,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12766: \$? = $ac_status" >&5
+  echo "$as_me:12711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12772: \$? = $ac_status" >&5
+  echo "$as_me:12717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12779,7 +12724,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12782: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12727: 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
@@ -12788,7 +12733,7 @@
 
 else
 
-echo "$as_me:12791: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:12736: 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
@@ -12796,7 +12741,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12799 "configure"
+#line 12744 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12815,16 +12760,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12821: \$? = $ac_status" >&5
+  echo "$as_me:12766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12827: \$? = $ac_status" >&5
+  echo "$as_me:12772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -12835,7 +12780,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12838: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:12783: 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
 
@@ -12860,13 +12805,13 @@
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12863: checking for $ac_func" >&5
+echo "$as_me:12808: 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 12869 "configure"
+#line 12814 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12897,16 +12842,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12903: \$? = $ac_status" >&5
+  echo "$as_me:12848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12909: \$? = $ac_status" >&5
+  echo "$as_me:12854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12916,7 +12861,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12919: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12864: 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
@@ -12925,7 +12870,7 @@
 
 else
 
-echo "$as_me:12928: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:12873: 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
@@ -12933,7 +12878,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12936 "configure"
+#line 12881 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12952,16 +12897,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12958: \$? = $ac_status" >&5
+  echo "$as_me:12903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12964: \$? = $ac_status" >&5
+  echo "$as_me:12909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -12972,7 +12917,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12975: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:12920: 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
 
@@ -13009,19 +12954,34 @@
 	;;
 esac
 
-LIBS="$cf_cv_netlibs $LIBS"
+cf_add_libs="$cf_cv_netlibs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:13017: checking for inet_aton function" >&5
+echo "$as_me:12977: 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 13024 "configure"
+#line 12984 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13056,16 +13016,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13062: \$? = $ac_status" >&5
+  echo "$as_me:13022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13068: \$? = $ac_status" >&5
+  echo "$as_me:13028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -13075,7 +13035,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13078: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:13038: 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
 
@@ -13084,14 +13044,14 @@
 EOF
 
 else
-    echo "$as_me:13087: checking for inet_addr function" >&5
+    echo "$as_me:13047: 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 13094 "configure"
+#line 13054 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13126,16 +13086,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13132: \$? = $ac_status" >&5
+  echo "$as_me:13092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13138: \$? = $ac_status" >&5
+  echo "$as_me:13098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -13145,10 +13105,10 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13148: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:13108: 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:13151: checking for library with inet_addr" >&5
+	echo "$as_me:13111: 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
@@ -13159,7 +13119,7 @@
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13162 "configure"
+#line 13122 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13175,16 +13135,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13181: \$? = $ac_status" >&5
+  echo "$as_me:13141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13187: \$? = $ac_status" >&5
+  echo "$as_me:13147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -13198,18 +13158,34 @@
 	    done
 
 fi
-echo "$as_me:13201: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:13161: result: $cf_cv_lib_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
 	if test "$cf_cv_lib_inet_addr" != no ; then
-	    LIBS="$cf_cv_lib_inet_addr $LIBS"
+
+cf_add_libs="$cf_cv_lib_inet_addr"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 	else
-	    { echo "$as_me:13206: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:13182: 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:13212: checking if you want to use pkg-config" >&5
+echo "$as_me:13188: 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.
@@ -13219,7 +13195,7 @@
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:13222: result: $cf_pkg_config" >&5
+echo "$as_me:13198: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in #(vi
@@ -13231,7 +13207,7 @@
 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:13234: checking for $ac_word" >&5
+echo "$as_me:13210: 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
@@ -13248,7 +13224,7 @@
   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:13251: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13227: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13259,10 +13235,10 @@
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:13262: result: $PKG_CONFIG" >&5
+  echo "$as_me:13238: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:13265: result: no" >&5
+  echo "$as_me:13241: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13271,7 +13247,7 @@
   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:13274: checking for $ac_word" >&5
+echo "$as_me:13250: 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
@@ -13288,7 +13264,7 @@
   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:13291: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13267: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13300,10 +13276,10 @@
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:13303: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:13279: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:13306: result: no" >&5
+  echo "$as_me:13282: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13346,7 +13322,7 @@
   PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:13349: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+  { { echo "$as_me:13325: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -13395,7 +13371,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13398 "configure"
+#line 13374 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13407,16 +13383,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13413: \$? = $ac_status" >&5
+  echo "$as_me:13389: \$? = $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:13392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13419: \$? = $ac_status" >&5
+  echo "$as_me:13395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13433,7 +13409,7 @@
 		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}:13412: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13474,7 +13450,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13477 "configure"
+#line 13453 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13486,16 +13462,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13492: \$? = $ac_status" >&5
+  echo "$as_me:13468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13498: \$? = $ac_status" >&5
+  echo "$as_me:13474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13512,7 +13488,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13515: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13491: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13528,7 +13504,7 @@
 fi
 
 	else
-{ { echo "$as_me:13531: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13507: 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
@@ -13553,7 +13529,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13556: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13532: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13582,7 +13558,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13585: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13561: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13591,7 +13567,7 @@
 fi
 
 	else
-{ { echo "$as_me:13594: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13570: 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
@@ -13608,15 +13584,15 @@
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:13611: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:13587: 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:13615: result: yes" >&5
+					echo "$as_me:13591: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:13619: result: no" >&5
+					echo "$as_me:13595: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -13652,7 +13628,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -13693,7 +13669,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -13740,9 +13716,24 @@
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:13743: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:13719: 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...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
-					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			fi
 			;;
@@ -13761,7 +13752,7 @@
 			*-ldl) #(vi
 				;;
 			*)
-				echo "$as_me:13764: checking for dlsym in -ldl" >&5
+				echo "$as_me:13755: 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
@@ -13769,7 +13760,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13772 "configure"
+#line 13763 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13788,16 +13779,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13794: \$? = $ac_status" >&5
+  echo "$as_me:13785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13800: \$? = $ac_status" >&5
+  echo "$as_me:13791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -13808,7 +13799,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13811: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:13802: 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"
@@ -13824,12 +13815,12 @@
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:13827: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13818: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13832 "configure"
+#line 13823 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13858,16 +13849,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13864: \$? = $ac_status" >&5
+  echo "$as_me:13855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13870: \$? = $ac_status" >&5
+  echo "$as_me:13861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -13881,7 +13872,7 @@
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13884 "configure"
+#line 13875 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13910,16 +13901,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13916: \$? = $ac_status" >&5
+  echo "$as_me:13907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13922: \$? = $ac_status" >&5
+  echo "$as_me:13913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -13936,9 +13927,9 @@
 
     test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:13939: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:13930: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:13941: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13932: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13975,17 +13966,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/openssl &&       cf_search="$cf_search /usr/include/openssl"
-	test -d /usr/include/openssl/include &&    cf_search="$cf_search /usr/include/openssl/include"
-	test -d /usr/openssl/include &&       cf_search="$cf_search /usr/openssl/include"
-	test -d /usr/openssl/include/openssl &&    cf_search="$cf_search /usr/openssl/include/openssl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -13997,39 +13977,28 @@
 	test -d $prefix/openssl/include/openssl &&    cf_search="$cf_search $prefix/openssl/include/openssl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/openssl &&       cf_search="$cf_search /usr/local/include/openssl"
-	test -d /usr/local/include/openssl/include &&    cf_search="$cf_search /usr/local/include/openssl/include"
-	test -d /usr/local/openssl/include &&       cf_search="$cf_search /usr/local/openssl/include"
-	test -d /usr/local/openssl/include/openssl &&    cf_search="$cf_search /usr/local/openssl/include/openssl"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/openssl &&       cf_search="$cf_search /opt/include/openssl"
-	test -d /opt/include/openssl/include &&    cf_search="$cf_search /opt/include/openssl/include"
-	test -d /opt/openssl/include &&       cf_search="$cf_search /opt/openssl/include"
-	test -d /opt/openssl/include/openssl &&    cf_search="$cf_search /opt/openssl/include/openssl"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/openssl &&       cf_search="$cf_search $HOME/include/openssl"
-	test -d $HOME/include/openssl/include &&    cf_search="$cf_search $HOME/include/openssl/include"
-	test -d $HOME/openssl/include &&       cf_search="$cf_search $HOME/openssl/include"
-	test -d $HOME/openssl/include/openssl &&    cf_search="$cf_search $HOME/openssl/include/openssl"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/openssl &&       cf_search="$cf_search $cf_subdir_prefix/include/openssl"
+	test -d $cf_subdir_prefix/include/openssl/include &&    cf_search="$cf_search $cf_subdir_prefix/include/openssl/include"
+	test -d $cf_subdir_prefix/openssl/include &&       cf_search="$cf_search $cf_subdir_prefix/openssl/include"
+	test -d $cf_subdir_prefix/openssl/include/openssl &&    cf_search="$cf_search $cf_subdir_prefix/openssl/include/openssl"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -14051,11 +14020,11 @@
       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}:14054: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14023: 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 14058 "configure"
+#line 14027 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14084,21 +14053,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14090: \$? = $ac_status" >&5
+  echo "$as_me:14059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14096: \$? = $ac_status" >&5
+  echo "$as_me:14065: \$? = $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}:14101: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14070: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14116,7 +14085,7 @@
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:14119: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14088: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -14124,7 +14093,7 @@
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 14127 "configure"
+#line 14096 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14153,21 +14122,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14125: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14159: \$? = $ac_status" >&5
+  echo "$as_me:14128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14165: \$? = $ac_status" >&5
+  echo "$as_me:14134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:14170: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:14139: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -14208,17 +14177,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/ssl &&       cf_search="$cf_search /usr/lib/ssl"
-	test -d /usr/lib/ssl/lib &&    cf_search="$cf_search /usr/lib/ssl/lib"
-	test -d /usr/ssl/lib &&       cf_search="$cf_search /usr/ssl/lib"
-	test -d /usr/ssl/lib/ssl &&    cf_search="$cf_search /usr/ssl/lib/ssl"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -14230,39 +14188,28 @@
 	test -d $prefix/ssl/lib/ssl &&    cf_search="$cf_search $prefix/ssl/lib/ssl"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/ssl &&       cf_search="$cf_search /usr/local/lib/ssl"
-	test -d /usr/local/lib/ssl/lib &&    cf_search="$cf_search /usr/local/lib/ssl/lib"
-	test -d /usr/local/ssl/lib &&       cf_search="$cf_search /usr/local/ssl/lib"
-	test -d /usr/local/ssl/lib/ssl &&    cf_search="$cf_search /usr/local/ssl/lib/ssl"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/ssl &&       cf_search="$cf_search /opt/lib/ssl"
-	test -d /opt/lib/ssl/lib &&    cf_search="$cf_search /opt/lib/ssl/lib"
-	test -d /opt/ssl/lib &&       cf_search="$cf_search /opt/ssl/lib"
-	test -d /opt/ssl/lib/ssl &&    cf_search="$cf_search /opt/ssl/lib/ssl"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/ssl &&       cf_search="$cf_search $HOME/lib/ssl"
-	test -d $HOME/lib/ssl/lib &&    cf_search="$cf_search $HOME/lib/ssl/lib"
-	test -d $HOME/ssl/lib &&       cf_search="$cf_search $HOME/ssl/lib"
-	test -d $HOME/ssl/lib/ssl &&    cf_search="$cf_search $HOME/ssl/lib/ssl"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/ssl &&       cf_search="$cf_search $cf_subdir_prefix/lib/ssl"
+	test -d $cf_subdir_prefix/lib/ssl/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/ssl/lib"
+	test -d $cf_subdir_prefix/ssl/lib &&       cf_search="$cf_search $cf_subdir_prefix/ssl/lib"
+	test -d $cf_subdir_prefix/ssl/lib/ssl &&    cf_search="$cf_search $cf_subdir_prefix/ssl/lib/ssl"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_ssl in $cf_search
@@ -14270,13 +14217,13 @@
           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}:14273: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14220: 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 14279 "configure"
+#line 14226 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14305,21 +14252,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14311: \$? = $ac_status" >&5
+  echo "$as_me:14258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14317: \$? = $ac_status" >&5
+  echo "$as_me:14264: \$? = $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}:14322: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14269: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -14381,7 +14328,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14384: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14331: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14390,7 +14337,23 @@
 fi
 
 				fi
-				LIBS="-lssl $cf_extra_ssl_libs $LIBS"
+
+cf_add_libs="-lssl $cf_extra_ssl_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 				if test -n "$cf_cv_header_path_ssl" ; then
 					case $cf_cv_header_path_ssl in #(vi
 					/usr/include/openssl) #(vi
@@ -14421,7 +14384,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14424 "configure"
+#line 14387 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14433,16 +14396,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14439: \$? = $ac_status" >&5
+  echo "$as_me:14402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14445: \$? = $ac_status" >&5
+  echo "$as_me:14408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14459,7 +14422,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14462: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14425: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14490,7 +14453,7 @@
 		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}:14493: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14456: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case $cf_cv_header_path_ssl in #(vi
 			*/openssl)
@@ -14503,10 +14466,10 @@
 			esac
 		fi
 
-echo "$as_me:14506: checking for X509 support" >&5
+echo "$as_me:14469: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14509 "configure"
+#line 14472 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14520,7 +14483,12 @@
 #include <ssl.h>
 #endif
 
+#if defined(USE_GNUTLS_INCL)
+#include <gnutls/x509.h>
+#else
 #include <openssl/x509.h>
+#endif
+
 int
 main ()
 {
@@ -14530,16 +14498,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14536: \$? = $ac_status" >&5
+  echo "$as_me:14504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14542: \$? = $ac_status" >&5
+  echo "$as_me:14510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14548,7 +14516,7 @@
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14551: result: $cf_x509_support" >&5
+echo "$as_me:14519: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -14600,7 +14568,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14603 "configure"
+#line 14571 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14612,16 +14580,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14618: \$? = $ac_status" >&5
+  echo "$as_me:14586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14624: \$? = $ac_status" >&5
+  echo "$as_me:14592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14638,7 +14606,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14641: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14609: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14679,7 +14647,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14682 "configure"
+#line 14650 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14691,16 +14659,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14697: \$? = $ac_status" >&5
+  echo "$as_me:14665: \$? = $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:14668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14703: \$? = $ac_status" >&5
+  echo "$as_me:14671: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14717,7 +14685,7 @@
 		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}:14688: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14733,7 +14701,7 @@
 fi
 
 	else
-{ { echo "$as_me:14736: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14704: 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
@@ -14758,7 +14726,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14761: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14729: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14787,7 +14755,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14790: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14758: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14796,7 +14764,7 @@
 fi
 
 	else
-{ { echo "$as_me:14799: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14767: 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
@@ -14814,12 +14782,12 @@
 		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}:14817: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:14785: 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}:14822: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14790: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -14855,7 +14823,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -14896,7 +14864,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -14931,14 +14899,29 @@
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:14934: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14902: 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...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
-					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:14941: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14924: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -14958,12 +14941,12 @@
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:14961: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:14944: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14966 "configure"
+#line 14949 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14992,16 +14975,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14998: \$? = $ac_status" >&5
+  echo "$as_me:14981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15004: \$? = $ac_status" >&5
+  echo "$as_me:14987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15012,10 +14995,10 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS"
+LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15018 "configure"
+#line 15001 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15044,16 +15027,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15050: \$? = $ac_status" >&5
+  echo "$as_me:15033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15056: \$? = $ac_status" >&5
+  echo "$as_me:15039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15070,9 +15053,9 @@
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15073: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15056: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15075: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15058: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15109,17 +15092,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/gnutls &&       cf_search="$cf_search /usr/include/gnutls"
-	test -d /usr/include/gnutls/include &&    cf_search="$cf_search /usr/include/gnutls/include"
-	test -d /usr/gnutls/include &&       cf_search="$cf_search /usr/gnutls/include"
-	test -d /usr/gnutls/include/gnutls &&    cf_search="$cf_search /usr/gnutls/include/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -15131,39 +15103,28 @@
 	test -d $prefix/gnutls/include/gnutls &&    cf_search="$cf_search $prefix/gnutls/include/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/gnutls &&       cf_search="$cf_search /usr/local/include/gnutls"
-	test -d /usr/local/include/gnutls/include &&    cf_search="$cf_search /usr/local/include/gnutls/include"
-	test -d /usr/local/gnutls/include &&       cf_search="$cf_search /usr/local/gnutls/include"
-	test -d /usr/local/gnutls/include/gnutls &&    cf_search="$cf_search /usr/local/gnutls/include/gnutls"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/gnutls &&       cf_search="$cf_search /opt/include/gnutls"
-	test -d /opt/include/gnutls/include &&    cf_search="$cf_search /opt/include/gnutls/include"
-	test -d /opt/gnutls/include &&       cf_search="$cf_search /opt/gnutls/include"
-	test -d /opt/gnutls/include/gnutls &&    cf_search="$cf_search /opt/gnutls/include/gnutls"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/gnutls &&       cf_search="$cf_search $HOME/include/gnutls"
-	test -d $HOME/include/gnutls/include &&    cf_search="$cf_search $HOME/include/gnutls/include"
-	test -d $HOME/gnutls/include &&       cf_search="$cf_search $HOME/gnutls/include"
-	test -d $HOME/gnutls/include/gnutls &&    cf_search="$cf_search $HOME/gnutls/include/gnutls"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/include/gnutls"
+	test -d $cf_subdir_prefix/include/gnutls/include &&    cf_search="$cf_search $cf_subdir_prefix/include/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/include/gnutls"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -15185,11 +15146,11 @@
       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}:15188: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15149: 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 15192 "configure"
+#line 15153 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15218,21 +15179,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15224: \$? = $ac_status" >&5
+  echo "$as_me:15185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15230: \$? = $ac_status" >&5
+  echo "$as_me:15191: \$? = $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}:15235: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15196: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15250,7 +15211,7 @@
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15253: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15214: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -15285,17 +15246,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/gnutls &&       cf_search="$cf_search /usr/lib/gnutls"
-	test -d /usr/lib/gnutls/lib &&    cf_search="$cf_search /usr/lib/gnutls/lib"
-	test -d /usr/gnutls/lib &&       cf_search="$cf_search /usr/gnutls/lib"
-	test -d /usr/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/gnutls/lib/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -15307,39 +15257,28 @@
 	test -d $prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $prefix/gnutls/lib/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/gnutls &&       cf_search="$cf_search /usr/local/lib/gnutls"
-	test -d /usr/local/lib/gnutls/lib &&    cf_search="$cf_search /usr/local/lib/gnutls/lib"
-	test -d /usr/local/gnutls/lib &&       cf_search="$cf_search /usr/local/gnutls/lib"
-	test -d /usr/local/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/local/gnutls/lib/gnutls"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/gnutls &&       cf_search="$cf_search /opt/lib/gnutls"
-	test -d /opt/lib/gnutls/lib &&    cf_search="$cf_search /opt/lib/gnutls/lib"
-	test -d /opt/gnutls/lib &&       cf_search="$cf_search /opt/gnutls/lib"
-	test -d /opt/gnutls/lib/gnutls &&    cf_search="$cf_search /opt/gnutls/lib/gnutls"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/gnutls &&       cf_search="$cf_search $HOME/lib/gnutls"
-	test -d $HOME/lib/gnutls/lib &&    cf_search="$cf_search $HOME/lib/gnutls/lib"
-	test -d $HOME/gnutls/lib &&       cf_search="$cf_search $HOME/gnutls/lib"
-	test -d $HOME/gnutls/lib/gnutls &&    cf_search="$cf_search $HOME/gnutls/lib/gnutls"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/lib/gnutls"
+	test -d $cf_subdir_prefix/lib/gnutls/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/lib/gnutls"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_gnutls in $cf_search
@@ -15347,13 +15286,13 @@
           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}:15350: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15289: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
-            LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS"
+            LIBS="-lgnutls  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 15356 "configure"
+#line 15295 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15382,21 +15321,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15388: \$? = $ac_status" >&5
+  echo "$as_me:15327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15394: \$? = $ac_status" >&5
+  echo "$as_me:15333: \$? = $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}:15399: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15338: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -15473,7 +15412,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15476 "configure"
+#line 15415 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15485,16 +15424,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15491: \$? = $ac_status" >&5
+  echo "$as_me:15430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15497: \$? = $ac_status" >&5
+  echo "$as_me:15436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15511,7 +15450,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:15514: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15453: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15550,7 +15489,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15553: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15492: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15559,14 +15498,112 @@
 fi
 
 		fi
-		LIBS="-lgnutls -lgcrypt $LIBS"
+
+cf_add_libs="-lgnutls"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+		echo "$as_me:15518: 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 15524 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gnutls_rnd (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gnutls_rnd ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gnutls_rnd) || defined (__stub___gnutls_rnd)
+choke me
+#else
+f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15555: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15558: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15561: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15564: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gnutls_rnd=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_gnutls_rnd=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:15574: 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
+#define HAVE_GNUTLS_RND 1
+EOF
+
+else
+
+cf_add_libs="-lgcrypt"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:15566: checking for X509 support" >&5
+echo "$as_me:15603: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15569 "configure"
+#line 15606 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15580,7 +15617,12 @@
 #include <ssl.h>
 #endif
 
+#if defined(USE_GNUTLS_INCL)
+#include <gnutls/x509.h>
+#else
 #include <openssl/x509.h>
+#endif
+
 int
 main ()
 {
@@ -15590,16 +15632,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15596: \$? = $ac_status" >&5
+  echo "$as_me:15638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15602: \$? = $ac_status" >&5
+  echo "$as_me:15644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -15608,7 +15650,7 @@
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:15611: result: $cf_x509_support" >&5
+echo "$as_me:15653: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15623,13 +15665,13 @@
 for ac_func in gnutls_priority_set_direct
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15626: checking for $ac_func" >&5
+echo "$as_me:15668: 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 15632 "configure"
+#line 15674 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15660,16 +15702,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15666: \$? = $ac_status" >&5
+  echo "$as_me:15708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15672: \$? = $ac_status" >&5
+  echo "$as_me:15714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15679,7 +15721,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15682: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15724: 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
@@ -15728,7 +15770,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15731 "configure"
+#line 15773 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15740,16 +15782,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15746: \$? = $ac_status" >&5
+  echo "$as_me:15788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15752: \$? = $ac_status" >&5
+  echo "$as_me:15794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15766,7 +15808,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:15769: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15811: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15807,7 +15849,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15810 "configure"
+#line 15852 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15819,16 +15861,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15825: \$? = $ac_status" >&5
+  echo "$as_me:15867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15831: \$? = $ac_status" >&5
+  echo "$as_me:15873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15845,7 +15887,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:15848: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15890: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15861,7 +15903,7 @@
 fi
 
 	else
-{ { echo "$as_me:15864: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15906: 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
@@ -15886,7 +15928,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15889: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15931: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15915,7 +15957,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15918: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15960: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15924,7 +15966,7 @@
 fi
 
 	else
-{ { echo "$as_me:15927: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15969: 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
@@ -15942,12 +15984,12 @@
 		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}:15945: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15987: 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}:15950: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15992: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -15983,7 +16025,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -16024,7 +16066,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -16059,14 +16101,29 @@
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16062: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16104: 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...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
-					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16069: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16126: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16086,12 +16143,12 @@
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16089: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16146: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16094 "configure"
+#line 16151 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16120,16 +16177,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16126: \$? = $ac_status" >&5
+  echo "$as_me:16183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16132: \$? = $ac_status" >&5
+  echo "$as_me:16189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16140,10 +16197,10 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
+LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16146 "configure"
+#line 16203 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16172,16 +16229,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16232: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16178: \$? = $ac_status" >&5
+  echo "$as_me:16235: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16184: \$? = $ac_status" >&5
+  echo "$as_me:16241: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16198,9 +16255,9 @@
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16201: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16258: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16203: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16260: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16237,17 +16294,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/gnutls &&       cf_search="$cf_search /usr/include/gnutls"
-	test -d /usr/include/gnutls/include &&    cf_search="$cf_search /usr/include/gnutls/include"
-	test -d /usr/gnutls/include &&       cf_search="$cf_search /usr/gnutls/include"
-	test -d /usr/gnutls/include/gnutls &&    cf_search="$cf_search /usr/gnutls/include/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -16259,39 +16305,28 @@
 	test -d $prefix/gnutls/include/gnutls &&    cf_search="$cf_search $prefix/gnutls/include/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/gnutls &&       cf_search="$cf_search /usr/local/include/gnutls"
-	test -d /usr/local/include/gnutls/include &&    cf_search="$cf_search /usr/local/include/gnutls/include"
-	test -d /usr/local/gnutls/include &&       cf_search="$cf_search /usr/local/gnutls/include"
-	test -d /usr/local/gnutls/include/gnutls &&    cf_search="$cf_search /usr/local/gnutls/include/gnutls"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/gnutls &&       cf_search="$cf_search /opt/include/gnutls"
-	test -d /opt/include/gnutls/include &&    cf_search="$cf_search /opt/include/gnutls/include"
-	test -d /opt/gnutls/include &&       cf_search="$cf_search /opt/gnutls/include"
-	test -d /opt/gnutls/include/gnutls &&    cf_search="$cf_search /opt/gnutls/include/gnutls"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/gnutls &&       cf_search="$cf_search $HOME/include/gnutls"
-	test -d $HOME/include/gnutls/include &&    cf_search="$cf_search $HOME/include/gnutls/include"
-	test -d $HOME/gnutls/include &&       cf_search="$cf_search $HOME/gnutls/include"
-	test -d $HOME/gnutls/include/gnutls &&    cf_search="$cf_search $HOME/gnutls/include/gnutls"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/include/gnutls"
+	test -d $cf_subdir_prefix/include/gnutls/include &&    cf_search="$cf_search $cf_subdir_prefix/include/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/include"
+	test -d $cf_subdir_prefix/gnutls/include/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/include/gnutls"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -16313,11 +16348,11 @@
       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}:16316: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16351: 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 16320 "configure"
+#line 16355 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16346,21 +16381,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16349: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16352: \$? = $ac_status" >&5
+  echo "$as_me:16387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16358: \$? = $ac_status" >&5
+  echo "$as_me:16393: \$? = $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}:16363: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16398: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16378,7 +16413,7 @@
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16381: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16416: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -16413,17 +16448,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/gnutls &&       cf_search="$cf_search /usr/lib/gnutls"
-	test -d /usr/lib/gnutls/lib &&    cf_search="$cf_search /usr/lib/gnutls/lib"
-	test -d /usr/gnutls/lib &&       cf_search="$cf_search /usr/gnutls/lib"
-	test -d /usr/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/gnutls/lib/gnutls"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -16435,39 +16459,28 @@
 	test -d $prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $prefix/gnutls/lib/gnutls"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/gnutls &&       cf_search="$cf_search /usr/local/lib/gnutls"
-	test -d /usr/local/lib/gnutls/lib &&    cf_search="$cf_search /usr/local/lib/gnutls/lib"
-	test -d /usr/local/gnutls/lib &&       cf_search="$cf_search /usr/local/gnutls/lib"
-	test -d /usr/local/gnutls/lib/gnutls &&    cf_search="$cf_search /usr/local/gnutls/lib/gnutls"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/gnutls &&       cf_search="$cf_search /opt/lib/gnutls"
-	test -d /opt/lib/gnutls/lib &&    cf_search="$cf_search /opt/lib/gnutls/lib"
-	test -d /opt/gnutls/lib &&       cf_search="$cf_search /opt/gnutls/lib"
-	test -d /opt/gnutls/lib/gnutls &&    cf_search="$cf_search /opt/gnutls/lib/gnutls"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/gnutls &&       cf_search="$cf_search $HOME/lib/gnutls"
-	test -d $HOME/lib/gnutls/lib &&    cf_search="$cf_search $HOME/lib/gnutls/lib"
-	test -d $HOME/gnutls/lib &&       cf_search="$cf_search $HOME/gnutls/lib"
-	test -d $HOME/gnutls/lib/gnutls &&    cf_search="$cf_search $HOME/gnutls/lib/gnutls"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/gnutls &&       cf_search="$cf_search $cf_subdir_prefix/lib/gnutls"
+	test -d $cf_subdir_prefix/lib/gnutls/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib &&       cf_search="$cf_search $cf_subdir_prefix/gnutls/lib"
+	test -d $cf_subdir_prefix/gnutls/lib/gnutls &&    cf_search="$cf_search $cf_subdir_prefix/gnutls/lib/gnutls"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_gnutls in $cf_search
@@ -16475,13 +16488,13 @@
           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}:16478: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16491: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
-            LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
+            LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 16484 "configure"
+#line 16497 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16510,21 +16523,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16516: \$? = $ac_status" >&5
+  echo "$as_me:16529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16522: \$? = $ac_status" >&5
+  echo "$as_me:16535: \$? = $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}:16527: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16540: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -16601,7 +16614,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16604 "configure"
+#line 16617 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16613,16 +16626,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16619: \$? = $ac_status" >&5
+  echo "$as_me:16632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16625: \$? = $ac_status" >&5
+  echo "$as_me:16638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16639,7 +16652,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16642: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16655: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16678,7 +16691,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16681: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16694: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16687,10 +16700,108 @@
 fi
 
 		fi
-		LIBS="-lgnutls -lgcrypt $LIBS"
+
+cf_add_libs="-lgnutls"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+		echo "$as_me:16720: 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 16726 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gnutls_rnd (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gnutls_rnd ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gnutls_rnd) || defined (__stub___gnutls_rnd)
+choke me
+#else
+f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:16757: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:16760: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:16763: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:16766: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gnutls_rnd=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_gnutls_rnd=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:16776: 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
+#define HAVE_GNUTLS_RND 1
+EOF
+
+else
+
+cf_add_libs="-lgcrypt"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:16693: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:16804: 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
@@ -16698,7 +16809,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16701 "configure"
+#line 16812 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16717,16 +16828,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16723: \$? = $ac_status" >&5
+  echo "$as_me:16834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16729: \$? = $ac_status" >&5
+  echo "$as_me:16840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -16737,12 +16848,28 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16740: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:16851: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
-  LIBS="-lgnutls-openssl $LIBS"
+
+cf_add_libs="-lgnutls-openssl"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 else
-  echo "$as_me:16745: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:16872: 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
@@ -16750,7 +16877,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16753 "configure"
+#line 16880 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16769,16 +16896,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16775: \$? = $ac_status" >&5
+  echo "$as_me:16902: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16781: \$? = $ac_status" >&5
+  echo "$as_me:16908: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -16789,12 +16916,28 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16792: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:16919: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
-  LIBS="-lgnutls-extra $LIBS"
+
+cf_add_libs="-lgnutls-extra"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 else
-  { { echo "$as_me:16797: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:16940: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16803,10 +16946,10 @@
 
 			fi
 
-echo "$as_me:16806: checking for X509 support" >&5
+echo "$as_me:16949: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16809 "configure"
+#line 16952 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16820,7 +16963,12 @@
 #include <ssl.h>
 #endif
 
+#if defined(USE_GNUTLS_INCL)
+#include <gnutls/x509.h>
+#else
 #include <openssl/x509.h>
+#endif
+
 int
 main ()
 {
@@ -16830,16 +16978,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16836: \$? = $ac_status" >&5
+  echo "$as_me:16984: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16842: \$? = $ac_status" >&5
+  echo "$as_me:16990: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -16848,7 +16996,7 @@
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:16851: result: $cf_x509_support" >&5
+echo "$as_me:16999: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -16880,7 +17028,7 @@
 	;;
 yes) #(vi
 
-echo "$as_me:16883: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:17031: 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
@@ -16888,7 +17036,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16891 "configure"
+#line 17039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16907,16 +17055,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16913: \$? = $ac_status" >&5
+  echo "$as_me:17061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16919: \$? = $ac_status" >&5
+  echo "$as_me:17067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -16927,7 +17075,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16930: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:17078: 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
@@ -16942,11 +17090,11 @@
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me:-configure}:16945: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:17093: 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:16949: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:17097: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -16961,18 +17109,33 @@
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:16964: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:17112: 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:16970: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:17118: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
 esac
-LIBS="$cf_ssl_library $LIBS"
+
+cf_add_libs="$cf_ssl_library"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 cf_ssl_subincs=yes
 if test -n "$cf_ssl_root" ; then
@@ -16997,7 +17160,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -17038,7 +17201,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -17061,10 +17224,10 @@
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17064: checking for NSS compilant include directory" >&5
+echo "$as_me:17227: 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 17067 "configure"
+#line 17230 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17078,16 +17241,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17084: \$? = $ac_status" >&5
+  echo "$as_me:17247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17090: \$? = $ac_status" >&5
+  echo "$as_me:17253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17096,7 +17259,7 @@
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17099: result: $cf_ssl_incl" >&5
+echo "$as_me:17262: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -17105,10 +17268,10 @@
 
 fi
 
-echo "$as_me:17108: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17271: 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 17111 "configure"
+#line 17274 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17127,16 +17290,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17133: \$? = $ac_status" >&5
+  echo "$as_me:17296: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17139: \$? = $ac_status" >&5
+  echo "$as_me:17302: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17145,7 +17308,7 @@
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17148: result: $cf_ssl_library" >&5
+echo "$as_me:17311: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -17158,7 +17321,7 @@
 EOF
 
 else
-	{ { echo "$as_me:17161: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:17324: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17166,7 +17329,7 @@
 fi
 
 ### check for ipv6 support
-echo "$as_me:17169: checking whether to enable ipv6" >&5
+echo "$as_me:17332: 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.
@@ -17183,11 +17346,11 @@
 else
   enableval=no
 fi;
-echo "$as_me:17186: result: $enableval" >&5
+echo "$as_me:17349: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17190: checking ipv6 stack type" >&5
+echo "$as_me:17353: 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
@@ -17208,7 +17371,7 @@
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17211 "configure"
+#line 17374 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17225,7 +17388,7 @@
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17228 "configure"
+#line 17391 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17242,7 +17405,7 @@
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17245 "configure"
+#line 17408 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -17268,7 +17431,7 @@
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17271 "configure"
+#line 17434 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17285,7 +17448,7 @@
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17288 "configure"
+#line 17451 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -17302,7 +17465,7 @@
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17305 "configure"
+#line 17468 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17324,13 +17487,13 @@
 done
 
 fi
-echo "$as_me:17327: result: $cf_cv_ipv6type" >&5
+echo "$as_me:17490: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:17333: checking for IPv6 library if required" >&5
+echo "$as_me:17496: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -17360,13 +17523,13 @@
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:17363: result: $cf_ipv6lib" >&5
+echo "$as_me:17526: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17369 "configure"
+#line 17532 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17382,16 +17545,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17388: \$? = $ac_status" >&5
+  echo "$as_me:17551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17394: \$? = $ac_status" >&5
+  echo "$as_me:17557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17430,17 +17593,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/$cf_ipv6dir &&       cf_search="$cf_search /usr/include/$cf_ipv6dir"
-	test -d /usr/include/$cf_ipv6dir/include &&    cf_search="$cf_search /usr/include/$cf_ipv6dir/include"
-	test -d /usr/$cf_ipv6dir/include &&       cf_search="$cf_search /usr/$cf_ipv6dir/include"
-	test -d /usr/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search /usr/$cf_ipv6dir/include/$cf_ipv6dir"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -17452,39 +17604,28 @@
 	test -d $prefix/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $prefix/$cf_ipv6dir/include/$cf_ipv6dir"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/$cf_ipv6dir &&       cf_search="$cf_search /usr/local/include/$cf_ipv6dir"
-	test -d /usr/local/include/$cf_ipv6dir/include &&    cf_search="$cf_search /usr/local/include/$cf_ipv6dir/include"
-	test -d /usr/local/$cf_ipv6dir/include &&       cf_search="$cf_search /usr/local/$cf_ipv6dir/include"
-	test -d /usr/local/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search /usr/local/$cf_ipv6dir/include/$cf_ipv6dir"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/$cf_ipv6dir &&       cf_search="$cf_search /opt/include/$cf_ipv6dir"
-	test -d /opt/include/$cf_ipv6dir/include &&    cf_search="$cf_search /opt/include/$cf_ipv6dir/include"
-	test -d /opt/$cf_ipv6dir/include &&       cf_search="$cf_search /opt/$cf_ipv6dir/include"
-	test -d /opt/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search /opt/$cf_ipv6dir/include/$cf_ipv6dir"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/$cf_ipv6dir &&       cf_search="$cf_search $HOME/include/$cf_ipv6dir"
-	test -d $HOME/include/$cf_ipv6dir/include &&    cf_search="$cf_search $HOME/include/$cf_ipv6dir/include"
-	test -d $HOME/$cf_ipv6dir/include &&       cf_search="$cf_search $HOME/$cf_ipv6dir/include"
-	test -d $HOME/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $HOME/$cf_ipv6dir/include/$cf_ipv6dir"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/$cf_ipv6dir &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ipv6dir"
+	test -d $cf_subdir_prefix/include/$cf_ipv6dir/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ipv6dir/include"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/include"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/include/$cf_ipv6dir"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -17531,7 +17672,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17534 "configure"
+#line 17675 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17543,16 +17684,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17546: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17549: \$? = $ac_status" >&5
+  echo "$as_me:17690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17555: \$? = $ac_status" >&5
+  echo "$as_me:17696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17569,7 +17710,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:17572: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17713: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17595,13 +17736,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:17598: checking for getaddrinfo" >&5
+	echo "$as_me:17739: 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 17604 "configure"
+#line 17745 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -17632,16 +17773,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17638: \$? = $ac_status" >&5
+  echo "$as_me:17779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17644: \$? = $ac_status" >&5
+  echo "$as_me:17785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -17651,18 +17792,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17654: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:17795: 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:17661: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:17802: 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 17665 "configure"
+#line 17806 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17678,25 +17819,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17684: \$? = $ac_status" >&5
+  echo "$as_me:17825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17690: \$? = $ac_status" >&5
+  echo "$as_me:17831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17692: result: yes" >&5
+  echo "$as_me:17833: 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:17699: result: no" >&5
+echo "$as_me:17840: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -17727,17 +17868,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/$cf_ipv6dir &&       cf_search="$cf_search /usr/lib/$cf_ipv6dir"
-	test -d /usr/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search /usr/lib/$cf_ipv6dir/lib"
-	test -d /usr/$cf_ipv6dir/lib &&       cf_search="$cf_search /usr/$cf_ipv6dir/lib"
-	test -d /usr/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search /usr/$cf_ipv6dir/lib/$cf_ipv6dir"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -17749,48 +17879,37 @@
 	test -d $prefix/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $prefix/$cf_ipv6dir/lib/$cf_ipv6dir"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/$cf_ipv6dir &&       cf_search="$cf_search /usr/local/lib/$cf_ipv6dir"
-	test -d /usr/local/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search /usr/local/lib/$cf_ipv6dir/lib"
-	test -d /usr/local/$cf_ipv6dir/lib &&       cf_search="$cf_search /usr/local/$cf_ipv6dir/lib"
-	test -d /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/$cf_ipv6dir &&       cf_search="$cf_search /opt/lib/$cf_ipv6dir"
-	test -d /opt/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search /opt/lib/$cf_ipv6dir/lib"
-	test -d /opt/$cf_ipv6dir/lib &&       cf_search="$cf_search /opt/$cf_ipv6dir/lib"
-	test -d /opt/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search /opt/$cf_ipv6dir/lib/$cf_ipv6dir"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/$cf_ipv6dir &&       cf_search="$cf_search $HOME/lib/$cf_ipv6dir"
-	test -d $HOME/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search $HOME/lib/$cf_ipv6dir/lib"
-	test -d $HOME/$cf_ipv6dir/lib &&       cf_search="$cf_search $HOME/$cf_ipv6dir/lib"
-	test -d $HOME/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $HOME/$cf_ipv6dir/lib/$cf_ipv6dir"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/$cf_ipv6dir &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_ipv6dir"
+	test -d $cf_subdir_prefix/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_ipv6dir/lib"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/lib"
+	test -d $cf_subdir_prefix/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/lib/$cf_ipv6dir"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17789: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:17908: 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 17793 "configure"
+#line 17912 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17806,25 +17925,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17812: \$? = $ac_status" >&5
+  echo "$as_me:17931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17818: \$? = $ac_status" >&5
+  echo "$as_me:17937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17820: result: yes" >&5
+  echo "$as_me:17939: 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:17827: result: no" >&5
+echo "$as_me:17946: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17839,7 +17958,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:17842: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:17961: 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;}
@@ -17847,7 +17966,7 @@
 	fi
 fi
 
-echo "$as_me:17850: checking working getaddrinfo" >&5
+echo "$as_me:17969: 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
@@ -17857,7 +17976,7 @@
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17860 "configure"
+#line 17979 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17937,15 +18056,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17943: \$? = $ac_status" >&5
+  echo "$as_me:18062: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17948: \$? = $ac_status" >&5
+  echo "$as_me:18067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -17958,7 +18077,7 @@
 fi
 
 fi
-echo "$as_me:17961: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18080: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -17974,12 +18093,12 @@
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:17977: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:18096: 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:17982: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:18101: 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.
@@ -17990,7 +18109,7 @@
 
 fi
 
-echo "$as_me:17993: checking for screen type" >&5
+echo "$as_me:18112: 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
@@ -18004,7 +18123,7 @@
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:18007: error: Unexpected value" >&5
+*)	{ { echo "$as_me:18126: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18013,13 +18132,13 @@
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:18016: result: $cf_cv_screen" >&5
+echo "$as_me:18135: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 curses|ncurses*)
 
-echo "$as_me:18022: checking for specific curses-directory" >&5
+echo "$as_me:18141: 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.
@@ -18029,7 +18148,7 @@
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:18032: result: $cf_cv_curses_dir" >&5
+echo "$as_me:18151: 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" )
@@ -18060,7 +18179,7 @@
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:18063: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18182: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -18093,7 +18212,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18096 "configure"
+#line 18215 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18105,16 +18224,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18111: \$? = $ac_status" >&5
+  echo "$as_me:18230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18117: \$? = $ac_status" >&5
+  echo "$as_me:18236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18131,7 +18250,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:18134: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18253: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18165,7 +18284,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18168: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18287: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18184,7 +18303,7 @@
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:18187: checking for extra include directories" >&5
+echo "$as_me:18306: 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
@@ -18210,11 +18329,11 @@
 esac
 
 fi
-echo "$as_me:18213: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18332: 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:18217: checking if we have identified curses headers" >&5
+echo "$as_me:18336: 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
@@ -18226,7 +18345,7 @@
 	curses.h ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18229 "configure"
+#line 18348 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18238,16 +18357,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18244: \$? = $ac_status" >&5
+  echo "$as_me:18363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18250: \$? = $ac_status" >&5
+  echo "$as_me:18369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18258,11 +18377,11 @@
 done
 
 fi
-echo "$as_me:18261: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18380: 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:18265: error: No curses header-files found" >&5
+	{ { echo "$as_me:18384: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18272,23 +18391,23 @@
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18275: checking for $ac_header" >&5
+echo "$as_me:18394: 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 18281 "configure"
+#line 18400 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18285: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18404: \"$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:18291: \$? = $ac_status" >&5
+  echo "$as_me:18410: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18307,7 +18426,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18310: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18429: 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
@@ -18317,7 +18436,7 @@
 fi
 done
 
-echo "$as_me:18320: checking for terminfo header" >&5
+echo "$as_me:18439: 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
@@ -18335,7 +18454,7 @@
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18338 "configure"
+#line 18457 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18350,16 +18469,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18356: \$? = $ac_status" >&5
+  echo "$as_me:18475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18362: \$? = $ac_status" >&5
+  echo "$as_me:18481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18375,7 +18494,7 @@
 done
 
 fi
-echo "$as_me:18378: result: $cf_cv_term_header" >&5
+echo "$as_me:18497: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18407,7 +18526,7 @@
 	;;
 esac
 
-echo "$as_me:18410: checking for ncurses version" >&5
+echo "$as_me:18529: 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
@@ -18433,10 +18552,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18436: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18555: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18439: \$? = $ac_status" >&5
+  echo "$as_me:18558: \$? = $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%".*%%'`
@@ -18446,7 +18565,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18449 "configure"
+#line 18568 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18471,15 +18590,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18477: \$? = $ac_status" >&5
+  echo "$as_me:18596: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18482: \$? = $ac_status" >&5
+  echo "$as_me:18601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18493,17 +18612,17 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18496: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:18615: 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:18503: checking if we have identified curses libraries" >&5
+echo "$as_me:18622: 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 18506 "configure"
+#line 18625 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18515,16 +18634,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18521: \$? = $ac_status" >&5
+  echo "$as_me:18640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18527: \$? = $ac_status" >&5
+  echo "$as_me:18646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18533,13 +18652,13 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:18536: result: $cf_result" >&5
+echo "$as_me:18655: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-    echo "$as_me:18542: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:18661: 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
@@ -18547,7 +18666,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18550 "configure"
+#line 18669 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18566,16 +18685,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18572: \$? = $ac_status" >&5
+  echo "$as_me:18691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18578: \$? = $ac_status" >&5
+  echo "$as_me:18697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -18586,10 +18705,26 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18589: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:18708: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
-  LIBS="-lmytinfo $LIBS"
+
+cf_add_libs="-lmytinfo"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 fi
 
     ;;
@@ -18600,7 +18735,7 @@
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:18603: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:18738: 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
@@ -18608,7 +18743,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18611 "configure"
+#line 18746 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18627,16 +18762,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18633: \$? = $ac_status" >&5
+  echo "$as_me:18768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18639: \$? = $ac_status" >&5
+  echo "$as_me:18774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -18647,16 +18782,31 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18650: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:18785: 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
 
-			LIBS="-lcur_colr $LIBS"
+cf_add_libs="-lcur_colr"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 			ac_cv_func_initscr=yes
 
 else
 
-		echo "$as_me:18659: checking for initscr in -lHcurses" >&5
+		echo "$as_me:18809: 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
@@ -18664,7 +18814,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18667 "configure"
+#line 18817 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18683,16 +18833,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18689: \$? = $ac_status" >&5
+  echo "$as_me:18839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18695: \$? = $ac_status" >&5
+  echo "$as_me:18845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -18703,12 +18853,28 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18706: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:18856: 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
 
 			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
-			LIBS="-lHcurses $LIBS"
+
+cf_add_libs="-lHcurses"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 			CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
 			ac_cv_func_initscr=yes
 
@@ -18743,7 +18909,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18746: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18912: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18772,7 +18938,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18775: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18941: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18803,7 +18969,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18806: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18972: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18838,7 +19004,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18841: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19007: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18846,7 +19012,22 @@
   done
 fi
 
-			LIBS="-lcurses -ltermcap $LIBS"
+cf_add_libs="-lcurses -ltermcap"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 		fi
     fi
     ac_cv_func_initscr=yes
@@ -18867,13 +19048,13 @@
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:18870: checking for tgoto" >&5
+		echo "$as_me:19051: 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 18876 "configure"
+#line 19057 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -18904,16 +19085,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18910: \$? = $ac_status" >&5
+  echo "$as_me:19091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18916: \$? = $ac_status" >&5
+  echo "$as_me:19097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -18923,7 +19104,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18926: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:19107: 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
@@ -18932,7 +19113,7 @@
 			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:18935: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:19116: 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
@@ -18940,7 +19121,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18943 "configure"
+#line 19124 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18959,16 +19140,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18965: \$? = $ac_status" >&5
+  echo "$as_me:19146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18971: \$? = $ac_status" >&5
+  echo "$as_me:19152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18979,7 +19160,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18982: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19163: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -18998,7 +19179,7 @@
 		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:19001: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:19182: 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
@@ -19006,7 +19187,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19009 "configure"
+#line 19190 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19025,16 +19206,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19031: \$? = $ac_status" >&5
+  echo "$as_me:19212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19037: \$? = $ac_status" >&5
+  echo "$as_me:19218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19045,7 +19226,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19048: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19229: 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
@@ -19053,16 +19234,16 @@
 
 		done
 	fi
-	test $cf_curs_lib = unknown && { { echo "$as_me:19056: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:19237: 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:19062: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:19243: 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 19065 "configure"
+#line 19246 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19074,16 +19255,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19080: \$? = $ac_status" >&5
+  echo "$as_me:19261: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19086: \$? = $ac_status" >&5
+  echo "$as_me:19267: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19092,18 +19273,18 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19095: result: $cf_result" >&5
+		echo "$as_me:19276: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:19097: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:19278: 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:19103: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:19284: 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 19106 "configure"
+#line 19287 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19115,16 +19296,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19121: \$? = $ac_status" >&5
+  echo "$as_me:19302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19127: \$? = $ac_status" >&5
+  echo "$as_me:19308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19133,7 +19314,7 @@
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 19136 "configure"
+#line 19317 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19145,16 +19326,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19151: \$? = $ac_status" >&5
+  echo "$as_me:19332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19157: \$? = $ac_status" >&5
+  echo "$as_me:19338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19166,13 +19347,13 @@
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19169: result: $cf_result" >&5
+		echo "$as_me:19350: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:19175: checking for curses performance tradeoff" >&5
+echo "$as_me:19356: 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
@@ -19180,7 +19361,7 @@
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19183 "configure"
+#line 19364 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19199,20 +19380,20 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19205: \$? = $ac_status" >&5
+  echo "$as_me:19386: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19211: \$? = $ac_status" >&5
+  echo "$as_me:19392: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19215 "configure"
+#line 19396 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -19232,16 +19413,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19238: \$? = $ac_status" >&5
+  echo "$as_me:19419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19244: \$? = $ac_status" >&5
+  echo "$as_me:19425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -19256,21 +19437,21 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:19259: result: $cf_cv_curs_performance" >&5
+echo "$as_me:19440: 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:19266: checking for curses touchline function" >&5
+echo "$as_me:19447: 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 19273 "configure"
+#line 19454 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19283,23 +19464,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19289: \$? = $ac_status" >&5
+  echo "$as_me:19470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19295: \$? = $ac_status" >&5
+  echo "$as_me:19476: \$? = $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 19302 "configure"
+#line 19483 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19312,16 +19493,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19496: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19318: \$? = $ac_status" >&5
+  echo "$as_me:19499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19324: \$? = $ac_status" >&5
+  echo "$as_me:19505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -19333,7 +19514,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19336: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:19517: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -19364,7 +19545,7 @@
   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:19367: checking for $ac_word" >&5
+echo "$as_me:19548: 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
@@ -19379,7 +19560,7 @@
   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:19382: found $ac_dir/$ac_word" >&5
+echo "$as_me:19563: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -19387,10 +19568,10 @@
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:19390: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:19571: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:19393: result: no" >&5
+  echo "$as_me:19574: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19403,7 +19584,7 @@
 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:19406: checking for $ac_word" >&5
+echo "$as_me:19587: 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
@@ -19418,7 +19599,7 @@
   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:19421: found $ac_dir/$ac_word" >&5
+echo "$as_me:19602: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -19426,10 +19607,10 @@
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:19429: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:19610: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:19432: result: no" >&5
+  echo "$as_me:19613: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19443,11 +19624,26 @@
 if test "$NCURSES_CONFIG" != none ; then
 
 CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
-LIBS="`$NCURSES_CONFIG --libs` $LIBS"
+
+cf_add_libs="`$NCURSES_CONFIG --libs`"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:19450: checking if we have identified curses headers" >&5
+echo "$as_me:19646: 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
@@ -19461,7 +19657,7 @@
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19464 "configure"
+#line 19660 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -19473,16 +19669,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19479: \$? = $ac_status" >&5
+  echo "$as_me:19675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19485: \$? = $ac_status" >&5
+  echo "$as_me:19681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -19493,11 +19689,11 @@
 done
 
 fi
-echo "$as_me:19496: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:19692: 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:19500: error: No curses header-files found" >&5
+	{ { echo "$as_me:19696: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19507,23 +19703,23 @@
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:19510: checking for $ac_header" >&5
+echo "$as_me:19706: 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 19516 "configure"
+#line 19712 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19520: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19716: \"$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:19526: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19542,7 +19738,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19545: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19741: 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
@@ -19595,7 +19791,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19598 "configure"
+#line 19794 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19607,16 +19803,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19613: \$? = $ac_status" >&5
+  echo "$as_me:19809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19619: \$? = $ac_status" >&5
+  echo "$as_me:19815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19633,7 +19829,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:19636: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19832: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19650,7 +19846,7 @@
 
 }
 
-echo "$as_me:19653: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:19849: 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
@@ -19662,7 +19858,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19665 "configure"
+#line 19861 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -19686,16 +19882,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19692: \$? = $ac_status" >&5
+  echo "$as_me:19888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19698: \$? = $ac_status" >&5
+  echo "$as_me:19894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -19710,14 +19906,14 @@
 	done
 
 fi
-echo "$as_me:19713: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:19909: 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:19720: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:19916: 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
@@ -19757,17 +19953,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-	test -d /usr/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -19779,39 +19964,28 @@
 	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-	test -d /usr/local/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-	test -d /opt/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -19857,7 +20031,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19860 "configure"
+#line 20034 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19869,16 +20043,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19875: \$? = $ac_status" >&5
+  echo "$as_me:20049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19881: \$? = $ac_status" >&5
+  echo "$as_me:20055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19895,7 +20069,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:19898: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20072: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19916,7 +20090,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19919 "configure"
+#line 20093 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -19940,16 +20114,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19946: \$? = $ac_status" >&5
+  echo "$as_me:20120: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19952: \$? = $ac_status" >&5
+  echo "$as_me:20126: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -19970,12 +20144,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:19973: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20147: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:19978: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20152: 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%/[^/]*$%%'`
@@ -20008,7 +20182,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20011 "configure"
+#line 20185 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20020,16 +20194,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20197: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20026: \$? = $ac_status" >&5
+  echo "$as_me:20200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20032: \$? = $ac_status" >&5
+  echo "$as_me:20206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20046,7 +20220,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:20049: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20223: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20092,7 +20266,7 @@
 	;;
 esac
 
-echo "$as_me:20095: checking for terminfo header" >&5
+echo "$as_me:20269: 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
@@ -20110,7 +20284,7 @@
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20113 "configure"
+#line 20287 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20125,16 +20299,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20131: \$? = $ac_status" >&5
+  echo "$as_me:20305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20137: \$? = $ac_status" >&5
+  echo "$as_me:20311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20150,7 +20324,7 @@
 done
 
 fi
-echo "$as_me:20153: result: $cf_cv_term_header" >&5
+echo "$as_me:20327: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -20188,7 +20362,7 @@
 #define NCURSES 1
 EOF
 
-echo "$as_me:20191: checking for ncurses version" >&5
+echo "$as_me:20365: 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
@@ -20214,10 +20388,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:20217: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:20391: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:20220: \$? = $ac_status" >&5
+  echo "$as_me:20394: \$? = $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%".*%%'`
@@ -20227,7 +20401,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20230 "configure"
+#line 20404 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20252,15 +20426,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20258: \$? = $ac_status" >&5
+  echo "$as_me:20432: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20263: \$? = $ac_status" >&5
+  echo "$as_me:20437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -20274,7 +20448,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:20277: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:20451: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -20287,7 +20461,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:20290: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:20464: 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
@@ -20295,7 +20469,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20298 "configure"
+#line 20472 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20314,16 +20488,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20320: \$? = $ac_status" >&5
+  echo "$as_me:20494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20326: \$? = $ac_status" >&5
+  echo "$as_me:20500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -20334,10 +20508,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20337: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:20511: 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:20340: checking for initscr in -lgpm" >&5
+  echo "$as_me:20514: 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
@@ -20345,7 +20519,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20348 "configure"
+#line 20522 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20364,16 +20538,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20370: \$? = $ac_status" >&5
+  echo "$as_me:20544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20376: \$? = $ac_status" >&5
+  echo "$as_me:20550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -20384,7 +20558,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20387: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:20561: 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"
@@ -20399,7 +20573,7 @@
 	# 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:20402: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:20576: 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
@@ -20407,7 +20581,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20410 "configure"
+#line 20584 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20426,16 +20600,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20432: \$? = $ac_status" >&5
+  echo "$as_me:20606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20438: \$? = $ac_status" >&5
+  echo "$as_me:20612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -20446,7 +20620,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20449: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:20623: 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"
@@ -20456,22 +20630,52 @@
 	;;
 esac
 
-LIBS="$cf_ncurses_LIBS $LIBS"
+cf_add_libs="$cf_ncurses_LIBS"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-	LIBS="-l$cf_nculib_root $LIBS"
+
+cf_add_libs="-l$cf_nculib_root"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:20468: checking for initscr" >&5
+	echo "$as_me:20672: 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 20474 "configure"
+#line 20678 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -20502,16 +20706,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20508: \$? = $ac_status" >&5
+  echo "$as_me:20712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20514: \$? = $ac_status" >&5
+  echo "$as_me:20718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -20521,18 +20725,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20524: result: $ac_cv_func_initscr" >&5
+echo "$as_me:20728: 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:20531: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:20735: 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 20535 "configure"
+#line 20739 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20544,25 +20748,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20550: \$? = $ac_status" >&5
+  echo "$as_me:20754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20556: \$? = $ac_status" >&5
+  echo "$as_me:20760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20558: result: yes" >&5
+  echo "$as_me:20762: 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:20565: result: no" >&5
+echo "$as_me:20769: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -20593,17 +20797,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
-	test -d /usr/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -20615,48 +20808,37 @@
 	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-	test -d /usr/local/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
-	test -d /opt/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:20655: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:20837: 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 20659 "configure"
+#line 20841 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20668,25 +20850,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20674: \$? = $ac_status" >&5
+  echo "$as_me:20856: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20680: \$? = $ac_status" >&5
+  echo "$as_me:20862: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20682: result: yes" >&5
+  echo "$as_me:20864: 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:20689: result: no" >&5
+echo "$as_me:20871: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -20701,7 +20883,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:20704: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:20886: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20709,7 +20891,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:20712: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:20894: 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
@@ -20719,7 +20901,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20722 "configure"
+#line 20904 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20731,23 +20913,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20737: \$? = $ac_status" >&5
+  echo "$as_me:20919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20743: \$? = $ac_status" >&5
+  echo "$as_me:20925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20745: result: yes" >&5
+  echo "$as_me:20927: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20750: result: no" >&5
+echo "$as_me:20932: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -20765,7 +20947,7 @@
 	;;
 ncursesw)
 
-echo "$as_me:20768: checking for multibyte character support" >&5
+echo "$as_me:20950: 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
@@ -20773,7 +20955,7 @@
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20776 "configure"
+#line 20958 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20786,16 +20968,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20792: \$? = $ac_status" >&5
+  echo "$as_me:20974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20798: \$? = $ac_status" >&5
+  echo "$as_me:20980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -20807,12 +20989,12 @@
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:20810: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20992: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20815 "configure"
+#line 20997 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20825,16 +21007,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20831: \$? = $ac_status" >&5
+  echo "$as_me:21013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20837: \$? = $ac_status" >&5
+  echo "$as_me:21019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20848,7 +21030,7 @@
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20851 "configure"
+#line 21033 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20861,16 +21043,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20867: \$? = $ac_status" >&5
+  echo "$as_me:21049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20873: \$? = $ac_status" >&5
+  echo "$as_me:21055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20887,9 +21069,9 @@
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:20890: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:21072: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:20892: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:21074: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20926,17 +21108,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"
-	test -d /usr/include/utf8/include &&    cf_search="$cf_search /usr/include/utf8/include"
-	test -d /usr/utf8/include &&       cf_search="$cf_search /usr/utf8/include"
-	test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -20948,39 +21119,28 @@
 	test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"
-	test -d /usr/local/include/utf8/include &&    cf_search="$cf_search /usr/local/include/utf8/include"
-	test -d /usr/local/utf8/include &&       cf_search="$cf_search /usr/local/utf8/include"
-	test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"
-	test -d /opt/include/utf8/include &&    cf_search="$cf_search /opt/include/utf8/include"
-	test -d /opt/utf8/include &&       cf_search="$cf_search /opt/utf8/include"
-	test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"
-	test -d $HOME/include/utf8/include &&    cf_search="$cf_search $HOME/include/utf8/include"
-	test -d $HOME/utf8/include &&       cf_search="$cf_search $HOME/utf8/include"
-	test -d $HOME/utf8/include/utf8 &&    cf_search="$cf_search $HOME/utf8/include/utf8"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
+	test -d $cf_subdir_prefix/include/utf8/include &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
+	test -d $cf_subdir_prefix/utf8/include &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
+	test -d $cf_subdir_prefix/utf8/include/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -21002,11 +21162,11 @@
       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}:21005: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21165: 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 21009 "configure"
+#line 21169 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -21019,21 +21179,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21025: \$? = $ac_status" >&5
+  echo "$as_me:21185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21031: \$? = $ac_status" >&5
+  echo "$as_me:21191: \$? = $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}:21036: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21196: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -21051,7 +21211,7 @@
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:21054: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:21214: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -21086,17 +21246,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"
-	test -d /usr/lib/utf8/lib &&    cf_search="$cf_search /usr/lib/utf8/lib"
-	test -d /usr/utf8/lib &&       cf_search="$cf_search /usr/utf8/lib"
-	test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -21108,39 +21257,28 @@
 	test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"
-	test -d /usr/local/lib/utf8/lib &&    cf_search="$cf_search /usr/local/lib/utf8/lib"
-	test -d /usr/local/utf8/lib &&       cf_search="$cf_search /usr/local/utf8/lib"
-	test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"
-	test -d /opt/lib/utf8/lib &&    cf_search="$cf_search /opt/lib/utf8/lib"
-	test -d /opt/utf8/lib &&       cf_search="$cf_search /opt/utf8/lib"
-	test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"
-	test -d $HOME/lib/utf8/lib &&    cf_search="$cf_search $HOME/lib/utf8/lib"
-	test -d $HOME/utf8/lib &&       cf_search="$cf_search $HOME/utf8/lib"
-	test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
+	test -d $cf_subdir_prefix/lib/utf8/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
+	test -d $cf_subdir_prefix/utf8/lib &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
+	test -d $cf_subdir_prefix/utf8/lib/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_utf8 in $cf_search
@@ -21148,13 +21286,13 @@
           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}:21151: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21289: 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 21157 "configure"
+#line 21295 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -21167,21 +21305,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21173: \$? = $ac_status" >&5
+  echo "$as_me:21311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21179: \$? = $ac_status" >&5
+  echo "$as_me:21317: \$? = $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}:21184: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21322: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -21223,7 +21361,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21226: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:21364: 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
@@ -21258,7 +21396,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21261 "configure"
+#line 21399 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21270,16 +21408,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21273: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21276: \$? = $ac_status" >&5
+  echo "$as_me:21414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21282: \$? = $ac_status" >&5
+  echo "$as_me:21420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21296,7 +21434,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21299: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21437: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21330,7 +21468,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:21333: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21471: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -21338,7 +21476,22 @@
   done
 fi
 
-	LIBS="$cf_cv_library_file_utf8 $LIBS"
+cf_add_libs="$cf_cv_library_file_utf8"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 fi
 
 cf_ncuconfig_root=ncursesw
@@ -21350,7 +21503,7 @@
   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:21353: checking for $ac_word" >&5
+echo "$as_me:21506: 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
@@ -21365,7 +21518,7 @@
   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:21368: found $ac_dir/$ac_word" >&5
+echo "$as_me:21521: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21373,10 +21526,10 @@
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:21376: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:21529: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21379: result: no" >&5
+  echo "$as_me:21532: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21389,7 +21542,7 @@
 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:21392: checking for $ac_word" >&5
+echo "$as_me:21545: 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
@@ -21404,7 +21557,7 @@
   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:21407: found $ac_dir/$ac_word" >&5
+echo "$as_me:21560: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21412,10 +21565,10 @@
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:21415: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:21568: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21418: result: no" >&5
+  echo "$as_me:21571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21429,11 +21582,26 @@
 if test "$NCURSES_CONFIG" != none ; then
 
 CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
-LIBS="`$NCURSES_CONFIG --libs` $LIBS"
+
+cf_add_libs="`$NCURSES_CONFIG --libs`"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:21436: checking if we have identified curses headers" >&5
+echo "$as_me:21604: 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
@@ -21447,7 +21615,7 @@
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21450 "configure"
+#line 21618 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21459,16 +21627,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21465: \$? = $ac_status" >&5
+  echo "$as_me:21633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21471: \$? = $ac_status" >&5
+  echo "$as_me:21639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21479,11 +21647,11 @@
 done
 
 fi
-echo "$as_me:21482: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21650: 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:21486: error: No curses header-files found" >&5
+	{ { echo "$as_me:21654: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21493,23 +21661,23 @@
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21496: checking for $ac_header" >&5
+echo "$as_me:21664: 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 21502 "configure"
+#line 21670 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21506: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21674: \"$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:21512: \$? = $ac_status" >&5
+  echo "$as_me:21680: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21528,7 +21696,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21531: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21699: 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
@@ -21581,7 +21749,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21584 "configure"
+#line 21752 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21593,16 +21761,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21599: \$? = $ac_status" >&5
+  echo "$as_me:21767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21605: \$? = $ac_status" >&5
+  echo "$as_me:21773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21619,7 +21787,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21622: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21790: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21636,7 +21804,7 @@
 
 }
 
-echo "$as_me:21639: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:21807: 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
@@ -21648,7 +21816,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21651 "configure"
+#line 21819 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -21680,16 +21848,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21686: \$? = $ac_status" >&5
+  echo "$as_me:21854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21692: \$? = $ac_status" >&5
+  echo "$as_me:21860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -21704,14 +21872,14 @@
 	done
 
 fi
-echo "$as_me:21707: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:21875: 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:21714: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:21882: 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
@@ -21751,17 +21919,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-	test -d /usr/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -21773,39 +21930,28 @@
 	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-	test -d /usr/local/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-	test -d /opt/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+	test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+	test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -21851,7 +21997,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21854 "configure"
+#line 22000 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21863,16 +22009,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21866: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21869: \$? = $ac_status" >&5
+  echo "$as_me:22015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21875: \$? = $ac_status" >&5
+  echo "$as_me:22021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21889,7 +22035,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21892: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22038: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21910,7 +22056,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21913 "configure"
+#line 22059 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -21934,16 +22080,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21940: \$? = $ac_status" >&5
+  echo "$as_me:22086: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21946: \$? = $ac_status" >&5
+  echo "$as_me:22092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -21964,12 +22110,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21967: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22113: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:21972: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22118: 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%/[^/]*$%%'`
@@ -22002,7 +22148,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22005 "configure"
+#line 22151 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22014,16 +22160,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22163: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22020: \$? = $ac_status" >&5
+  echo "$as_me:22166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22026: \$? = $ac_status" >&5
+  echo "$as_me:22172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22040,7 +22186,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:22043: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22189: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22086,7 +22232,7 @@
 	;;
 esac
 
-echo "$as_me:22089: checking for terminfo header" >&5
+echo "$as_me:22235: 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
@@ -22104,7 +22250,7 @@
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22107 "configure"
+#line 22253 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22119,16 +22265,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22122: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22125: \$? = $ac_status" >&5
+  echo "$as_me:22271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22131: \$? = $ac_status" >&5
+  echo "$as_me:22277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -22144,7 +22290,7 @@
 done
 
 fi
-echo "$as_me:22147: result: $cf_cv_term_header" >&5
+echo "$as_me:22293: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22182,7 +22328,7 @@
 #define NCURSES 1
 EOF
 
-echo "$as_me:22185: checking for ncurses version" >&5
+echo "$as_me:22331: 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
@@ -22208,10 +22354,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22211: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22357: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22214: \$? = $ac_status" >&5
+  echo "$as_me:22360: \$? = $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%".*%%'`
@@ -22221,7 +22367,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22224 "configure"
+#line 22370 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22246,15 +22392,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22252: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22257: \$? = $ac_status" >&5
+  echo "$as_me:22403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22268,7 +22414,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:22271: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22417: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -22281,7 +22427,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22284: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22430: 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
@@ -22289,7 +22435,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22292 "configure"
+#line 22438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22308,16 +22454,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22314: \$? = $ac_status" >&5
+  echo "$as_me:22460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22320: \$? = $ac_status" >&5
+  echo "$as_me:22466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -22328,10 +22474,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22331: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22477: 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:22334: checking for initscr in -lgpm" >&5
+  echo "$as_me:22480: 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
@@ -22339,7 +22485,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22342 "configure"
+#line 22488 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22358,16 +22504,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22364: \$? = $ac_status" >&5
+  echo "$as_me:22510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22370: \$? = $ac_status" >&5
+  echo "$as_me:22516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -22378,7 +22524,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22381: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22527: 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"
@@ -22393,7 +22539,7 @@
 	# 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:22396: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:22542: 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
@@ -22401,7 +22547,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22404 "configure"
+#line 22550 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22420,16 +22566,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22426: \$? = $ac_status" >&5
+  echo "$as_me:22572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22432: \$? = $ac_status" >&5
+  echo "$as_me:22578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22440,7 +22586,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22443: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22589: 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"
@@ -22450,22 +22596,52 @@
 	;;
 esac
 
-LIBS="$cf_ncurses_LIBS $LIBS"
+cf_add_libs="$cf_ncurses_LIBS"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-	LIBS="-l$cf_nculib_root $LIBS"
+
+cf_add_libs="-l$cf_nculib_root"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:22462: checking for initscr" >&5
+	echo "$as_me:22638: 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 22468 "configure"
+#line 22644 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -22496,16 +22672,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22502: \$? = $ac_status" >&5
+  echo "$as_me:22678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22508: \$? = $ac_status" >&5
+  echo "$as_me:22684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -22515,18 +22691,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22518: result: $ac_cv_func_initscr" >&5
+echo "$as_me:22694: 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:22525: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:22701: 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 22529 "configure"
+#line 22705 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22538,25 +22714,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22544: \$? = $ac_status" >&5
+  echo "$as_me:22720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22550: \$? = $ac_status" >&5
+  echo "$as_me:22726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22552: result: yes" >&5
+  echo "$as_me:22728: 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:22559: result: no" >&5
+echo "$as_me:22735: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22587,17 +22763,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
-	test -d /usr/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -22609,48 +22774,37 @@
 	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-	test -d /usr/local/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
-	test -d /opt/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+	test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+	test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22649: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:22803: 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 22653 "configure"
+#line 22807 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22662,25 +22816,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22668: \$? = $ac_status" >&5
+  echo "$as_me:22822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22674: \$? = $ac_status" >&5
+  echo "$as_me:22828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22676: result: yes" >&5
+  echo "$as_me:22830: 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:22683: result: no" >&5
+echo "$as_me:22837: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22695,7 +22849,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22698: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:22852: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22703,7 +22857,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:22706: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:22860: 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
@@ -22713,7 +22867,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22716 "configure"
+#line 22870 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22725,23 +22879,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22731: \$? = $ac_status" >&5
+  echo "$as_me:22885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22737: \$? = $ac_status" >&5
+  echo "$as_me:22891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22739: result: yes" >&5
+  echo "$as_me:22893: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22744: result: no" >&5
+echo "$as_me:22898: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -22771,7 +22925,7 @@
 	;;
 slang)
 
-echo "$as_me:22774: checking for slang header file" >&5
+echo "$as_me:22928: 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
@@ -22779,7 +22933,7 @@
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22782 "configure"
+#line 22936 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22791,16 +22945,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22797: \$? = $ac_status" >&5
+  echo "$as_me:22951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22803: \$? = $ac_status" >&5
+  echo "$as_me:22957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -22839,17 +22993,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/slang &&       cf_search="$cf_search /usr/include/slang"
-	test -d /usr/include/slang/include &&    cf_search="$cf_search /usr/include/slang/include"
-	test -d /usr/slang/include &&       cf_search="$cf_search /usr/slang/include"
-	test -d /usr/slang/include/slang &&    cf_search="$cf_search /usr/slang/include/slang"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -22861,39 +23004,28 @@
 	test -d $prefix/slang/include/slang &&    cf_search="$cf_search $prefix/slang/include/slang"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/slang &&       cf_search="$cf_search /usr/local/include/slang"
-	test -d /usr/local/include/slang/include &&    cf_search="$cf_search /usr/local/include/slang/include"
-	test -d /usr/local/slang/include &&       cf_search="$cf_search /usr/local/slang/include"
-	test -d /usr/local/slang/include/slang &&    cf_search="$cf_search /usr/local/slang/include/slang"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/slang &&       cf_search="$cf_search /opt/include/slang"
-	test -d /opt/include/slang/include &&    cf_search="$cf_search /opt/include/slang/include"
-	test -d /opt/slang/include &&       cf_search="$cf_search /opt/slang/include"
-	test -d /opt/slang/include/slang &&    cf_search="$cf_search /opt/slang/include/slang"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/slang &&       cf_search="$cf_search $HOME/include/slang"
-	test -d $HOME/include/slang/include &&    cf_search="$cf_search $HOME/include/slang/include"
-	test -d $HOME/slang/include &&       cf_search="$cf_search $HOME/slang/include"
-	test -d $HOME/slang/include/slang &&    cf_search="$cf_search $HOME/slang/include/slang"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/slang &&       cf_search="$cf_search $cf_subdir_prefix/include/slang"
+	test -d $cf_subdir_prefix/include/slang/include &&    cf_search="$cf_search $cf_subdir_prefix/include/slang/include"
+	test -d $cf_subdir_prefix/slang/include &&       cf_search="$cf_search $cf_subdir_prefix/slang/include"
+	test -d $cf_subdir_prefix/slang/include/slang &&    cf_search="$cf_search $cf_subdir_prefix/slang/include/slang"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -22927,7 +23059,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22930: result: $cf_cv_slang_header" >&5
+echo "$as_me:23062: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -22968,7 +23100,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22971 "configure"
+#line 23103 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22980,16 +23112,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22986: \$? = $ac_status" >&5
+  echo "$as_me:23118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22992: \$? = $ac_status" >&5
+  echo "$as_me:23124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23006,7 +23138,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:23009: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23141: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23036,7 +23168,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23039 "configure"
+#line 23171 "configure"
 #include "confdefs.h"
 
 int
@@ -23048,19 +23180,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23054: \$? = $ac_status" >&5
+  echo "$as_me:23186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23060: \$? = $ac_status" >&5
+  echo "$as_me:23192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23063 "configure"
+#line 23195 "configure"
 #include "confdefs.h"
 
 int
@@ -23072,16 +23204,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23078: \$? = $ac_status" >&5
+  echo "$as_me:23210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23084: \$? = $ac_status" >&5
+  echo "$as_me:23216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23092,7 +23224,7 @@
 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}:23095: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23227: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23107,10 +23239,10 @@
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:23110: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:23242: 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 23113 "configure"
+#line 23245 "configure"
 #include "confdefs.h"
 
 int
@@ -23122,16 +23254,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23128: \$? = $ac_status" >&5
+  echo "$as_me:23260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23134: \$? = $ac_status" >&5
+  echo "$as_me:23266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23140,7 +23272,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23143: result: $cf_result" >&5
+			echo "$as_me:23275: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -23157,7 +23289,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:23160: checking for initscr in -lcurses" >&5
+	echo "$as_me:23292: 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
@@ -23165,7 +23297,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23168 "configure"
+#line 23300 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23184,16 +23316,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23190: \$? = $ac_status" >&5
+  echo "$as_me:23322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23196: \$? = $ac_status" >&5
+  echo "$as_me:23328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23204,13 +23336,29 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23207: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23339: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
-  LIBS="-lcurses $LIBS"
+
+cf_add_libs="-lcurses"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 fi
 
-	echo "$as_me:23213: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23361: 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
@@ -23218,7 +23366,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23221 "configure"
+#line 23369 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23237,16 +23385,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23243: \$? = $ac_status" >&5
+  echo "$as_me:23391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23249: \$? = $ac_status" >&5
+  echo "$as_me:23397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23257,10 +23405,26 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23260: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23408: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
-  LIBS="-ltermcap $LIBS" cf_cv_termlib=termcap
+
+cf_add_libs="-ltermcap"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+ cf_cv_termlib=termcap
 fi
 
 fi
@@ -23268,20 +23432,20 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23271: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23435: 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:23278: checking for acos" >&5
+echo "$as_me:23442: 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 23284 "configure"
+#line 23448 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23312,16 +23476,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23318: \$? = $ac_status" >&5
+  echo "$as_me:23482: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23324: \$? = $ac_status" >&5
+  echo "$as_me:23488: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23331,13 +23495,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23334: result: $ac_cv_func_acos" >&5
+echo "$as_me:23498: 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:23340: checking for acos in -lm" >&5
+echo "$as_me:23504: 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
@@ -23345,7 +23509,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23348 "configure"
+#line 23512 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23364,16 +23528,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23370: \$? = $ac_status" >&5
+  echo "$as_me:23534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23376: \$? = $ac_status" >&5
+  echo "$as_me:23540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23384,7 +23548,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23387: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23551: 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
 
@@ -23410,13 +23574,13 @@
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23413: checking for v_init" >&5
+	echo "$as_me:23577: 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 23419 "configure"
+#line 23583 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23447,16 +23611,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23453: \$? = $ac_status" >&5
+  echo "$as_me:23617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23459: \$? = $ac_status" >&5
+  echo "$as_me:23623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23466,18 +23630,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23469: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23633: 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:23476: checking for v_init in -lvideo" >&5
+		echo "$as_me:23640: 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 23480 "configure"
+#line 23644 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23489,25 +23653,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23495: \$? = $ac_status" >&5
+  echo "$as_me:23659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23501: \$? = $ac_status" >&5
+  echo "$as_me:23665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23503: result: yes" >&5
+  echo "$as_me:23667: 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:23510: result: no" >&5
+echo "$as_me:23674: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23538,17 +23702,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/video &&       cf_search="$cf_search /usr/lib/video"
-	test -d /usr/lib/video/lib &&    cf_search="$cf_search /usr/lib/video/lib"
-	test -d /usr/video/lib &&       cf_search="$cf_search /usr/video/lib"
-	test -d /usr/video/lib/video &&    cf_search="$cf_search /usr/video/lib/video"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -23560,48 +23713,37 @@
 	test -d $prefix/video/lib/video &&    cf_search="$cf_search $prefix/video/lib/video"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/video &&       cf_search="$cf_search /usr/local/lib/video"
-	test -d /usr/local/lib/video/lib &&    cf_search="$cf_search /usr/local/lib/video/lib"
-	test -d /usr/local/video/lib &&       cf_search="$cf_search /usr/local/video/lib"
-	test -d /usr/local/video/lib/video &&    cf_search="$cf_search /usr/local/video/lib/video"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/video &&       cf_search="$cf_search /opt/lib/video"
-	test -d /opt/lib/video/lib &&    cf_search="$cf_search /opt/lib/video/lib"
-	test -d /opt/video/lib &&       cf_search="$cf_search /opt/video/lib"
-	test -d /opt/video/lib/video &&    cf_search="$cf_search /opt/video/lib/video"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/video &&       cf_search="$cf_search $HOME/lib/video"
-	test -d $HOME/lib/video/lib &&    cf_search="$cf_search $HOME/lib/video/lib"
-	test -d $HOME/video/lib &&       cf_search="$cf_search $HOME/video/lib"
-	test -d $HOME/video/lib/video &&    cf_search="$cf_search $HOME/video/lib/video"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/video &&       cf_search="$cf_search $cf_subdir_prefix/lib/video"
+	test -d $cf_subdir_prefix/lib/video/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/video/lib"
+	test -d $cf_subdir_prefix/video/lib &&       cf_search="$cf_search $cf_subdir_prefix/video/lib"
+	test -d $cf_subdir_prefix/video/lib/video &&    cf_search="$cf_search $cf_subdir_prefix/video/lib/video"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23600: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23742: 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 23604 "configure"
+#line 23746 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23613,25 +23755,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23619: \$? = $ac_status" >&5
+  echo "$as_me:23761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23625: \$? = $ac_status" >&5
+  echo "$as_me:23767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23627: result: yes" >&5
+  echo "$as_me:23769: 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:23634: result: no" >&5
+echo "$as_me:23776: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23646,7 +23788,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23649: error: Cannot link video library" >&5
+	{ { echo "$as_me:23791: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23656,13 +23798,13 @@
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:23659: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:23801: 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 23665 "configure"
+#line 23807 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -23693,16 +23835,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23699: \$? = $ac_status" >&5
+  echo "$as_me:23841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23705: \$? = $ac_status" >&5
+  echo "$as_me:23847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -23712,18 +23854,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23715: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:23857: 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:23722: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:23864: 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 23726 "configure"
+#line 23868 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23735,25 +23877,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23741: \$? = $ac_status" >&5
+  echo "$as_me:23883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23747: \$? = $ac_status" >&5
+  echo "$as_me:23889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23749: result: yes" >&5
+  echo "$as_me:23891: 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:23756: result: no" >&5
+echo "$as_me:23898: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23784,17 +23926,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/slang &&       cf_search="$cf_search /usr/lib/slang"
-	test -d /usr/lib/slang/lib &&    cf_search="$cf_search /usr/lib/slang/lib"
-	test -d /usr/slang/lib &&       cf_search="$cf_search /usr/slang/lib"
-	test -d /usr/slang/lib/slang &&    cf_search="$cf_search /usr/slang/lib/slang"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -23806,48 +23937,37 @@
 	test -d $prefix/slang/lib/slang &&    cf_search="$cf_search $prefix/slang/lib/slang"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/slang &&       cf_search="$cf_search /usr/local/lib/slang"
-	test -d /usr/local/lib/slang/lib &&    cf_search="$cf_search /usr/local/lib/slang/lib"
-	test -d /usr/local/slang/lib &&       cf_search="$cf_search /usr/local/slang/lib"
-	test -d /usr/local/slang/lib/slang &&    cf_search="$cf_search /usr/local/slang/lib/slang"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/slang &&       cf_search="$cf_search /opt/lib/slang"
-	test -d /opt/lib/slang/lib &&    cf_search="$cf_search /opt/lib/slang/lib"
-	test -d /opt/slang/lib &&       cf_search="$cf_search /opt/slang/lib"
-	test -d /opt/slang/lib/slang &&    cf_search="$cf_search /opt/slang/lib/slang"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/slang &&       cf_search="$cf_search $HOME/lib/slang"
-	test -d $HOME/lib/slang/lib &&    cf_search="$cf_search $HOME/lib/slang/lib"
-	test -d $HOME/slang/lib &&       cf_search="$cf_search $HOME/slang/lib"
-	test -d $HOME/slang/lib/slang &&    cf_search="$cf_search $HOME/slang/lib/slang"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/slang &&       cf_search="$cf_search $cf_subdir_prefix/lib/slang"
+	test -d $cf_subdir_prefix/lib/slang/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/slang/lib"
+	test -d $cf_subdir_prefix/slang/lib &&       cf_search="$cf_search $cf_subdir_prefix/slang/lib"
+	test -d $cf_subdir_prefix/slang/lib/slang &&    cf_search="$cf_search $cf_subdir_prefix/slang/lib/slang"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23846: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:23966: 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 23850 "configure"
+#line 23970 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23859,25 +23979,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23865: \$? = $ac_status" >&5
+  echo "$as_me:23985: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23871: \$? = $ac_status" >&5
+  echo "$as_me:23991: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23873: result: yes" >&5
+  echo "$as_me:23993: 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:23880: result: no" >&5
+echo "$as_me:24000: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23892,13 +24012,13 @@
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23895: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24015: 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:23901: checking if we can link slang without termcap" >&5
+echo "$as_me:24021: 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%^.%%'`
@@ -23907,7 +24027,7 @@
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 23910 "configure"
+#line 24030 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23919,16 +24039,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23925: \$? = $ac_status" >&5
+  echo "$as_me:24045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23931: \$? = $ac_status" >&5
+  echo "$as_me:24051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23937,13 +24057,13 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:23940: result: $cf_result" >&5
+echo "$as_me:24060: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:23946: checking for slang2 header file" >&5
+echo "$as_me:24066: 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
@@ -23951,7 +24071,7 @@
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23954 "configure"
+#line 24074 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23963,16 +24083,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23969: \$? = $ac_status" >&5
+  echo "$as_me:24089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23975: \$? = $ac_status" >&5
+  echo "$as_me:24095: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24011,17 +24131,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/slang2 &&       cf_search="$cf_search /usr/include/slang2"
-	test -d /usr/include/slang2/include &&    cf_search="$cf_search /usr/include/slang2/include"
-	test -d /usr/slang2/include &&       cf_search="$cf_search /usr/slang2/include"
-	test -d /usr/slang2/include/slang2 &&    cf_search="$cf_search /usr/slang2/include/slang2"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -24033,39 +24142,28 @@
 	test -d $prefix/slang2/include/slang2 &&    cf_search="$cf_search $prefix/slang2/include/slang2"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/slang2 &&       cf_search="$cf_search /usr/local/include/slang2"
-	test -d /usr/local/include/slang2/include &&    cf_search="$cf_search /usr/local/include/slang2/include"
-	test -d /usr/local/slang2/include &&       cf_search="$cf_search /usr/local/slang2/include"
-	test -d /usr/local/slang2/include/slang2 &&    cf_search="$cf_search /usr/local/slang2/include/slang2"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/slang2 &&       cf_search="$cf_search /opt/include/slang2"
-	test -d /opt/include/slang2/include &&    cf_search="$cf_search /opt/include/slang2/include"
-	test -d /opt/slang2/include &&       cf_search="$cf_search /opt/slang2/include"
-	test -d /opt/slang2/include/slang2 &&    cf_search="$cf_search /opt/slang2/include/slang2"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/slang2 &&       cf_search="$cf_search $HOME/include/slang2"
-	test -d $HOME/include/slang2/include &&    cf_search="$cf_search $HOME/include/slang2/include"
-	test -d $HOME/slang2/include &&       cf_search="$cf_search $HOME/slang2/include"
-	test -d $HOME/slang2/include/slang2 &&    cf_search="$cf_search $HOME/slang2/include/slang2"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/slang2 &&       cf_search="$cf_search $cf_subdir_prefix/include/slang2"
+	test -d $cf_subdir_prefix/include/slang2/include &&    cf_search="$cf_search $cf_subdir_prefix/include/slang2/include"
+	test -d $cf_subdir_prefix/slang2/include &&       cf_search="$cf_search $cf_subdir_prefix/slang2/include"
+	test -d $cf_subdir_prefix/slang2/include/slang2 &&    cf_search="$cf_search $cf_subdir_prefix/slang2/include/slang2"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -24099,7 +24197,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24102: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24200: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -24140,7 +24238,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24143 "configure"
+#line 24241 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24152,16 +24250,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24158: \$? = $ac_status" >&5
+  echo "$as_me:24256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24164: \$? = $ac_status" >&5
+  echo "$as_me:24262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24178,7 +24276,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24181: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24279: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24208,7 +24306,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24211 "configure"
+#line 24309 "configure"
 #include "confdefs.h"
 
 int
@@ -24220,19 +24318,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24226: \$? = $ac_status" >&5
+  echo "$as_me:24324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24232: \$? = $ac_status" >&5
+  echo "$as_me:24330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24235 "configure"
+#line 24333 "configure"
 #include "confdefs.h"
 
 int
@@ -24244,16 +24342,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24250: \$? = $ac_status" >&5
+  echo "$as_me:24348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24256: \$? = $ac_status" >&5
+  echo "$as_me:24354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24264,7 +24362,7 @@
 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}:24267: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24365: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24279,10 +24377,10 @@
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:24282: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24380: 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 24285 "configure"
+#line 24383 "configure"
 #include "confdefs.h"
 
 int
@@ -24294,16 +24392,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24300: \$? = $ac_status" >&5
+  echo "$as_me:24398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24306: \$? = $ac_status" >&5
+  echo "$as_me:24404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24312,7 +24410,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24315: result: $cf_result" >&5
+			echo "$as_me:24413: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24329,7 +24427,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:24332: checking for initscr in -lcurses" >&5
+	echo "$as_me:24430: 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
@@ -24337,7 +24435,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24340 "configure"
+#line 24438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24356,16 +24454,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24362: \$? = $ac_status" >&5
+  echo "$as_me:24460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24368: \$? = $ac_status" >&5
+  echo "$as_me:24466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24376,13 +24474,29 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24379: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24477: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
-  LIBS="-lcurses $LIBS"
+
+cf_add_libs="-lcurses"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 fi
 
-	echo "$as_me:24385: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24499: 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
@@ -24390,7 +24504,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24393 "configure"
+#line 24507 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24409,16 +24523,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24415: \$? = $ac_status" >&5
+  echo "$as_me:24529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24421: \$? = $ac_status" >&5
+  echo "$as_me:24535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24429,10 +24543,26 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24432: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24546: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
-  LIBS="-ltermcap $LIBS" cf_cv_termlib=termcap
+
+cf_add_libs="-ltermcap"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+ cf_cv_termlib=termcap
 fi
 
 fi
@@ -24440,20 +24570,20 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24443: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24573: 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:24450: checking for acos" >&5
+echo "$as_me:24580: 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 24456 "configure"
+#line 24586 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24484,16 +24614,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24490: \$? = $ac_status" >&5
+  echo "$as_me:24620: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24496: \$? = $ac_status" >&5
+  echo "$as_me:24626: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24503,13 +24633,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24506: result: $ac_cv_func_acos" >&5
+echo "$as_me:24636: 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:24512: checking for acos in -lm" >&5
+echo "$as_me:24642: 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
@@ -24517,7 +24647,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24520 "configure"
+#line 24650 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24536,16 +24666,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24542: \$? = $ac_status" >&5
+  echo "$as_me:24672: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24548: \$? = $ac_status" >&5
+  echo "$as_me:24678: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24556,7 +24686,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24559: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24689: 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
 
@@ -24582,13 +24712,13 @@
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24585: checking for v_init" >&5
+	echo "$as_me:24715: 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 24591 "configure"
+#line 24721 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24619,16 +24749,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24625: \$? = $ac_status" >&5
+  echo "$as_me:24755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24631: \$? = $ac_status" >&5
+  echo "$as_me:24761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24638,18 +24768,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24641: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24771: 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:24648: checking for v_init in -lvideo" >&5
+		echo "$as_me:24778: 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 24652 "configure"
+#line 24782 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24661,25 +24791,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24667: \$? = $ac_status" >&5
+  echo "$as_me:24797: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24673: \$? = $ac_status" >&5
+  echo "$as_me:24803: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24675: result: yes" >&5
+  echo "$as_me:24805: 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:24682: result: no" >&5
+echo "$as_me:24812: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24710,17 +24840,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/video &&       cf_search="$cf_search /usr/lib/video"
-	test -d /usr/lib/video/lib &&    cf_search="$cf_search /usr/lib/video/lib"
-	test -d /usr/video/lib &&       cf_search="$cf_search /usr/video/lib"
-	test -d /usr/video/lib/video &&    cf_search="$cf_search /usr/video/lib/video"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -24732,48 +24851,37 @@
 	test -d $prefix/video/lib/video &&    cf_search="$cf_search $prefix/video/lib/video"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/video &&       cf_search="$cf_search /usr/local/lib/video"
-	test -d /usr/local/lib/video/lib &&    cf_search="$cf_search /usr/local/lib/video/lib"
-	test -d /usr/local/video/lib &&       cf_search="$cf_search /usr/local/video/lib"
-	test -d /usr/local/video/lib/video &&    cf_search="$cf_search /usr/local/video/lib/video"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/video &&       cf_search="$cf_search /opt/lib/video"
-	test -d /opt/lib/video/lib &&    cf_search="$cf_search /opt/lib/video/lib"
-	test -d /opt/video/lib &&       cf_search="$cf_search /opt/video/lib"
-	test -d /opt/video/lib/video &&    cf_search="$cf_search /opt/video/lib/video"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/video &&       cf_search="$cf_search $HOME/lib/video"
-	test -d $HOME/lib/video/lib &&    cf_search="$cf_search $HOME/lib/video/lib"
-	test -d $HOME/video/lib &&       cf_search="$cf_search $HOME/video/lib"
-	test -d $HOME/video/lib/video &&    cf_search="$cf_search $HOME/video/lib/video"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/video &&       cf_search="$cf_search $cf_subdir_prefix/lib/video"
+	test -d $cf_subdir_prefix/lib/video/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/video/lib"
+	test -d $cf_subdir_prefix/video/lib &&       cf_search="$cf_search $cf_subdir_prefix/video/lib"
+	test -d $cf_subdir_prefix/video/lib/video &&    cf_search="$cf_search $cf_subdir_prefix/video/lib/video"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24772: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:24880: 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 24776 "configure"
+#line 24884 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24785,25 +24893,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24791: \$? = $ac_status" >&5
+  echo "$as_me:24899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24797: \$? = $ac_status" >&5
+  echo "$as_me:24905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24799: result: yes" >&5
+  echo "$as_me:24907: 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:24806: result: no" >&5
+echo "$as_me:24914: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24818,7 +24926,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24821: error: Cannot link video library" >&5
+	{ { echo "$as_me:24929: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24828,13 +24936,13 @@
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:24831: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24939: 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 24837 "configure"
+#line 24945 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24865,16 +24973,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24871: \$? = $ac_status" >&5
+  echo "$as_me:24979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24877: \$? = $ac_status" >&5
+  echo "$as_me:24985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24884,18 +24992,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24887: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24995: 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:24894: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25002: 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 24898 "configure"
+#line 25006 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24907,25 +25015,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24913: \$? = $ac_status" >&5
+  echo "$as_me:25021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24919: \$? = $ac_status" >&5
+  echo "$as_me:25027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24921: result: yes" >&5
+  echo "$as_me:25029: 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:24928: result: no" >&5
+echo "$as_me:25036: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24956,17 +25064,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/slang2 &&       cf_search="$cf_search /usr/lib/slang2"
-	test -d /usr/lib/slang2/lib &&    cf_search="$cf_search /usr/lib/slang2/lib"
-	test -d /usr/slang2/lib &&       cf_search="$cf_search /usr/slang2/lib"
-	test -d /usr/slang2/lib/slang2 &&    cf_search="$cf_search /usr/slang2/lib/slang2"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -24978,48 +25075,37 @@
 	test -d $prefix/slang2/lib/slang2 &&    cf_search="$cf_search $prefix/slang2/lib/slang2"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/slang2 &&       cf_search="$cf_search /usr/local/lib/slang2"
-	test -d /usr/local/lib/slang2/lib &&    cf_search="$cf_search /usr/local/lib/slang2/lib"
-	test -d /usr/local/slang2/lib &&       cf_search="$cf_search /usr/local/slang2/lib"
-	test -d /usr/local/slang2/lib/slang2 &&    cf_search="$cf_search /usr/local/slang2/lib/slang2"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/slang2 &&       cf_search="$cf_search /opt/lib/slang2"
-	test -d /opt/lib/slang2/lib &&    cf_search="$cf_search /opt/lib/slang2/lib"
-	test -d /opt/slang2/lib &&       cf_search="$cf_search /opt/slang2/lib"
-	test -d /opt/slang2/lib/slang2 &&    cf_search="$cf_search /opt/slang2/lib/slang2"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/slang2 &&       cf_search="$cf_search $HOME/lib/slang2"
-	test -d $HOME/lib/slang2/lib &&    cf_search="$cf_search $HOME/lib/slang2/lib"
-	test -d $HOME/slang2/lib &&       cf_search="$cf_search $HOME/slang2/lib"
-	test -d $HOME/slang2/lib/slang2 &&    cf_search="$cf_search $HOME/slang2/lib/slang2"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/slang2 &&       cf_search="$cf_search $cf_subdir_prefix/lib/slang2"
+	test -d $cf_subdir_prefix/lib/slang2/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/slang2/lib"
+	test -d $cf_subdir_prefix/slang2/lib &&       cf_search="$cf_search $cf_subdir_prefix/slang2/lib"
+	test -d $cf_subdir_prefix/slang2/lib/slang2 &&    cf_search="$cf_search $cf_subdir_prefix/slang2/lib/slang2"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25018: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25104: 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 25022 "configure"
+#line 25108 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25031,25 +25117,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25037: \$? = $ac_status" >&5
+  echo "$as_me:25123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25043: \$? = $ac_status" >&5
+  echo "$as_me:25129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25045: result: yes" >&5
+  echo "$as_me:25131: 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:25052: result: no" >&5
+echo "$as_me:25138: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25064,13 +25150,13 @@
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25067: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:25153: 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:25073: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25159: 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%^.%%'`
@@ -25079,7 +25165,7 @@
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25082 "configure"
+#line 25168 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25091,16 +25177,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25097: \$? = $ac_status" >&5
+  echo "$as_me:25183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25103: \$? = $ac_status" >&5
+  echo "$as_me:25189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25109,12 +25195,12 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25112: result: $cf_result" >&5
+echo "$as_me:25198: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:25117: error: cannot find slang headers" >&5
+		{ { echo "$as_me:25203: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25122,14 +25208,14 @@
 
 # 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:25125: checking if we must define UTF8" >&5
+echo "$as_me:25211: 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 25132 "configure"
+#line 25218 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25141,16 +25227,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25147: \$? = $ac_status" >&5
+  echo "$as_me:25233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25153: \$? = $ac_status" >&5
+  echo "$as_me:25239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -25158,7 +25244,7 @@
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25161 "configure"
+#line 25247 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -25172,16 +25258,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25178: \$? = $ac_status" >&5
+  echo "$as_me:25264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25184: \$? = $ac_status" >&5
+  echo "$as_me:25270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -25194,7 +25280,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25197: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:25283: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -25205,14 +25291,14 @@
 
 fi
 
-echo "$as_me:25208: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:25294: 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 25215 "configure"
+#line 25301 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25231,16 +25317,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25237: \$? = $ac_status" >&5
+  echo "$as_me:25323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25243: \$? = $ac_status" >&5
+  echo "$as_me:25329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -25251,20 +25337,20 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25254: result: $cf_cv_slang_unix" >&5
+echo "$as_me:25340: 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:25261: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:25347: 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 25267 "configure"
+#line 25353 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25280,16 +25366,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25286: \$? = $ac_status" >&5
+  echo "$as_me:25372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25292: \$? = $ac_status" >&5
+  echo "$as_me:25378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -25299,7 +25385,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25302: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:25388: 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
@@ -25315,13 +25401,13 @@
 
 fi
 
-	echo "$as_me:25318: checking for SLtt_Char_Type" >&5
+	echo "$as_me:25404: 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 25324 "configure"
+#line 25410 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25337,16 +25423,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25343: \$? = $ac_status" >&5
+  echo "$as_me:25429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25349: \$? = $ac_status" >&5
+  echo "$as_me:25435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -25356,7 +25442,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25359: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:25445: 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
@@ -25376,14 +25462,14 @@
 	;;
 esac
 
-echo "$as_me:25379: checking for chtype typedef" >&5
+echo "$as_me:25465: 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 25386 "configure"
+#line 25472 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25395,16 +25481,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25401: \$? = $ac_status" >&5
+  echo "$as_me:25487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25407: \$? = $ac_status" >&5
+  echo "$as_me:25493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -25414,7 +25500,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25417: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:25503: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -25422,14 +25508,14 @@
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:25425: checking if chtype is scalar or struct" >&5
+	echo "$as_me:25511: 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 25432 "configure"
+#line 25518 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25441,16 +25527,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25447: \$? = $ac_status" >&5
+  echo "$as_me:25533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25453: \$? = $ac_status" >&5
+  echo "$as_me:25539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -25460,7 +25546,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25463: result: $cf_cv_chtype_type" >&5
+echo "$as_me:25549: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -25471,7 +25557,7 @@
 	fi
 fi
 
-echo "$as_me:25474: checking if you want the wide-curses features" >&5
+echo "$as_me:25560: 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.
@@ -25488,10 +25574,10 @@
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:25491: result: $use_wide_curses" >&5
+echo "$as_me:25577: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:25494: checking if color-style code should be used" >&5
+echo "$as_me:25580: 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.
@@ -25511,7 +25597,7 @@
 
 case $use_color_style in
 no)
-	echo "$as_me:25514: result: no" >&5
+	echo "$as_me:25600: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -25521,10 +25607,10 @@
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:25524: result: yes" >&5
+	echo "$as_me:25610: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:25527: checking for location of style-sheet file" >&5
+	echo "$as_me:25613: 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.
@@ -25560,7 +25646,7 @@
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:25563: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25649: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -25569,7 +25655,7 @@
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:25572: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:25658: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -25582,7 +25668,7 @@
 	;;
 esac
 
-echo "$as_me:25585: checking for the default configuration-file" >&5
+echo "$as_me:25671: 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.
@@ -25618,7 +25704,7 @@
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:25621: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25707: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -25627,7 +25713,7 @@
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:25630: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:25716: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -25636,7 +25722,7 @@
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:25639: checking for the default configuration-path" >&5
+echo "$as_me:25725: 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.
@@ -25672,7 +25758,7 @@
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:25675: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25761: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -25681,7 +25767,7 @@
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:25684: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:25770: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -25691,7 +25777,7 @@
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:25694: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:25780: 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.
@@ -25708,7 +25794,7 @@
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:25711: result: $use_htmlized_cfg" >&5
+echo "$as_me:25797: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -25716,7 +25802,7 @@
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:25719: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:25805: 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.
@@ -25733,7 +25819,7 @@
   use_local_docs=no
 
 fi;
-echo "$as_me:25736: result: $use_local_docs" >&5
+echo "$as_me:25822: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -25741,7 +25827,7 @@
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:25744: checking for MIME library directory" >&5
+echo "$as_me:25830: 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.
@@ -25777,7 +25863,7 @@
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:25780: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25866: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -25786,7 +25872,7 @@
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:25789: result: $MIME_LIBDIR" >&5
+echo "$as_me:25875: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -25794,7 +25880,7 @@
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:25797: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:25883: 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.
@@ -25811,7 +25897,7 @@
   use_locale_charset=yes
 
 fi;
-echo "$as_me:25814: result: $use_locale_charset" >&5
+echo "$as_me:25900: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -25820,7 +25906,7 @@
 
 CHARSET_DEFS=
 
-echo "$as_me:25823: checking if you want only a few charsets" >&5
+echo "$as_me:25909: 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.
@@ -25832,7 +25918,7 @@
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:25835: result: yes" >&5
+	echo "$as_me:25921: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -25846,7 +25932,7 @@
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me:-configure}:25849: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:25935: 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'`
@@ -25873,28 +25959,28 @@
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:25876: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:25962: 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}:25882: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:25968: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:25887: result: no" >&5
+	echo "$as_me:25973: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25891: checking for ANSI C header files" >&5
+echo "$as_me:25977: 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 25897 "configure"
+#line 25983 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -25902,13 +25988,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:25905: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25991: \"$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:25911: \$? = $ac_status" >&5
+  echo "$as_me:25997: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25930,7 +26016,7 @@
 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 25933 "configure"
+#line 26019 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -25948,7 +26034,7 @@
 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 25951 "configure"
+#line 26037 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -25969,7 +26055,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25972 "configure"
+#line 26058 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -25995,15 +26081,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26001: \$? = $ac_status" >&5
+  echo "$as_me:26087: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26006: \$? = $ac_status" >&5
+  echo "$as_me:26092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26016,7 +26102,7 @@
 fi
 fi
 fi
-echo "$as_me:26019: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26105: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26026,13 +26112,13 @@
 
 fi
 
-echo "$as_me:26029: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26115: 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 26035 "configure"
+#line 26121 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -26048,16 +26134,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26137: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26054: \$? = $ac_status" >&5
+  echo "$as_me:26140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26060: \$? = $ac_status" >&5
+  echo "$as_me:26146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26067,7 +26153,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26070: result: $ac_cv_header_time" >&5
+echo "$as_me:26156: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26080,13 +26166,13 @@
 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:26083: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:26169: 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 26089 "configure"
+#line 26175 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -26101,16 +26187,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26107: \$? = $ac_status" >&5
+  echo "$as_me:26193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26113: \$? = $ac_status" >&5
+  echo "$as_me:26199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -26120,7 +26206,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26123: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26209: 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
@@ -26133,7 +26219,7 @@
 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:26136: checking for opendir in -ldir" >&5
+  echo "$as_me:26222: 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
@@ -26141,7 +26227,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26144 "configure"
+#line 26230 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26160,16 +26246,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26166: \$? = $ac_status" >&5
+  echo "$as_me:26252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26172: \$? = $ac_status" >&5
+  echo "$as_me:26258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -26180,14 +26266,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26183: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:26269: 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:26190: checking for opendir in -lx" >&5
+  echo "$as_me:26276: 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
@@ -26195,7 +26281,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26198 "configure"
+#line 26284 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26214,16 +26300,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26220: \$? = $ac_status" >&5
+  echo "$as_me:26306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26226: \$? = $ac_status" >&5
+  echo "$as_me:26312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -26234,7 +26320,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26237: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:26323: 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"
@@ -26262,23 +26348,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26265: checking for $ac_header" >&5
+echo "$as_me:26351: 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 26271 "configure"
+#line 26357 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26275: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26361: \"$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:26281: \$? = $ac_status" >&5
+  echo "$as_me:26367: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26297,7 +26383,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26300: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26386: 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
@@ -26307,14 +26393,14 @@
 fi
 done
 
-echo "$as_me:26310: checking termio.h and termios.h" >&5
+echo "$as_me:26396: 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 26317 "configure"
+#line 26403 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -26332,16 +26418,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26338: \$? = $ac_status" >&5
+  echo "$as_me:26424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26344: \$? = $ac_status" >&5
+  echo "$as_me:26430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -26352,21 +26438,21 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26355: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:26441: 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:26362: checking for sigaction and structs" >&5
+echo "$as_me:26448: 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 26369 "configure"
+#line 26455 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26386,16 +26472,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26392: \$? = $ac_status" >&5
+  echo "$as_me:26478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26398: \$? = $ac_status" >&5
+  echo "$as_me:26484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -26406,7 +26492,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26409: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:26495: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -26416,23 +26502,23 @@
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26419: checking for $ac_header" >&5
+echo "$as_me:26505: 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 26425 "configure"
+#line 26511 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26429: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26515: \"$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:26435: \$? = $ac_status" >&5
+  echo "$as_me:26521: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26451,7 +26537,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26454: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26540: 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
@@ -26472,23 +26558,23 @@
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26475: checking for $ac_header" >&5
+echo "$as_me:26561: 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 26481 "configure"
+#line 26567 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26485: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26571: \"$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:26491: \$? = $ac_status" >&5
+  echo "$as_me:26577: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26507,7 +26593,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26510: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26596: 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
@@ -26520,23 +26606,23 @@
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26523: checking for $ac_header" >&5
+echo "$as_me:26609: 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 26529 "configure"
+#line 26615 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26533: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26619: \"$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:26539: \$? = $ac_status" >&5
+  echo "$as_me:26625: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26555,7 +26641,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26558: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26644: 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
@@ -26577,14 +26663,14 @@
 fi
 fi
 
-echo "$as_me:26580: checking for union wait" >&5
+echo "$as_me:26666: 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 26587 "configure"
+#line 26673 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26600,16 +26686,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26606: \$? = $ac_status" >&5
+  echo "$as_me:26692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26612: \$? = $ac_status" >&5
+  echo "$as_me:26698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -26619,7 +26705,7 @@
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26622 "configure"
+#line 26708 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26639,16 +26725,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26645: \$? = $ac_status" >&5
+  echo "$as_me:26731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26651: \$? = $ac_status" >&5
+  echo "$as_me:26737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -26663,7 +26749,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:26666: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:26752: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -26672,14 +26758,14 @@
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:26675: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:26761: 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 26682 "configure"
+#line 26768 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26691,16 +26777,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26697: \$? = $ac_status" >&5
+  echo "$as_me:26783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26703: \$? = $ac_status" >&5
+  echo "$as_me:26789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -26712,21 +26798,21 @@
 
 fi
 
-	echo "$as_me:26715: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:26801: 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:26722: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:26808: 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 26729 "configure"
+#line 26815 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26738,16 +26824,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26744: \$? = $ac_status" >&5
+  echo "$as_me:26830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26750: \$? = $ac_status" >&5
+  echo "$as_me:26836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -26759,7 +26845,7 @@
 
 fi
 
-	echo "$as_me:26762: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:26848: 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
@@ -26768,13 +26854,13 @@
 
 fi
 
-echo "$as_me:26771: checking for uid_t in sys/types.h" >&5
+echo "$as_me:26857: 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 26777 "configure"
+#line 26863 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -26788,7 +26874,7 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:26791: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:26877: 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
 
@@ -26802,7 +26888,7 @@
 
 fi
 
-echo "$as_me:26805: checking type of array argument to getgroups" >&5
+echo "$as_me:26891: 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
@@ -26811,7 +26897,7 @@
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26814 "configure"
+#line 26900 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -26837,15 +26923,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26843: \$? = $ac_status" >&5
+  echo "$as_me:26929: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26848: \$? = $ac_status" >&5
+  echo "$as_me:26934: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -26858,7 +26944,7 @@
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 26861 "configure"
+#line 26947 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -26873,20 +26959,20 @@
 
 fi
 fi
-echo "$as_me:26876: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:26962: 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:26883: checking for off_t" >&5
+echo "$as_me:26969: 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 26889 "configure"
+#line 26975 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26901,16 +26987,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26907: \$? = $ac_status" >&5
+  echo "$as_me:26993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26913: \$? = $ac_status" >&5
+  echo "$as_me:26999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -26920,7 +27006,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26923: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27009: 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
   :
@@ -26932,13 +27018,13 @@
 
 fi
 
-echo "$as_me:26935: checking for pid_t" >&5
+echo "$as_me:27021: 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 26941 "configure"
+#line 27027 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26953,16 +27039,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26959: \$? = $ac_status" >&5
+  echo "$as_me:27045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26965: \$? = $ac_status" >&5
+  echo "$as_me:27051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -26972,7 +27058,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26975: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27061: 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
   :
@@ -26984,13 +27070,13 @@
 
 fi
 
-echo "$as_me:26987: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27073: 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 26993 "configure"
+#line 27079 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27004,7 +27090,7 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:27007: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27093: 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
 
@@ -27018,13 +27104,13 @@
 
 fi
 
-echo "$as_me:27021: checking for mode_t" >&5
+echo "$as_me:27107: 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 27027 "configure"
+#line 27113 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27039,16 +27125,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27045: \$? = $ac_status" >&5
+  echo "$as_me:27131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27051: \$? = $ac_status" >&5
+  echo "$as_me:27137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27058,7 +27144,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27061: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27147: 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
   :
@@ -27070,13 +27156,13 @@
 
 fi
 
-	echo "$as_me:27073: checking for ssize_t" >&5
+	echo "$as_me:27159: 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 27079 "configure"
+#line 27165 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27091,16 +27177,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27097: \$? = $ac_status" >&5
+  echo "$as_me:27183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27103: \$? = $ac_status" >&5
+  echo "$as_me:27189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -27110,7 +27196,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27113: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:27199: 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
@@ -27126,13 +27212,13 @@
 
 fi
 
-	echo "$as_me:27129: checking for socklen_t" >&5
+	echo "$as_me:27215: 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 27135 "configure"
+#line 27221 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27150,16 +27236,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27156: \$? = $ac_status" >&5
+  echo "$as_me:27242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27162: \$? = $ac_status" >&5
+  echo "$as_me:27248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -27169,7 +27255,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27172: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:27258: 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
@@ -27185,7 +27271,7 @@
 
 fi
 
-echo "$as_me:27188: checking for long long type" >&5
+echo "$as_me:27274: 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
@@ -27216,7 +27302,7 @@
 	rm -f conftest*
 
 fi
-echo "$as_me:27219: result: $cf_cv_type_long_long" >&5
+echo "$as_me:27305: 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
@@ -27227,14 +27313,14 @@
 
 fi
 
-echo "$as_me:27230: checking for tm.tm_gmtoff" >&5
+echo "$as_me:27316: 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 27237 "configure"
+#line 27323 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -27259,16 +27345,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27262: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27265: \$? = $ac_status" >&5
+  echo "$as_me:27351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27271: \$? = $ac_status" >&5
+  echo "$as_me:27357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -27279,20 +27365,20 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27282: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:27368: 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:27289: checking for int" >&5
+echo "$as_me:27375: 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 27295 "configure"
+#line 27381 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27307,16 +27393,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27313: \$? = $ac_status" >&5
+  echo "$as_me:27399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27319: \$? = $ac_status" >&5
+  echo "$as_me:27405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -27326,10 +27412,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27329: result: $ac_cv_type_int" >&5
+echo "$as_me:27415: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:27332: checking size of int" >&5
+echo "$as_me:27418: 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
@@ -27338,7 +27424,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27341 "configure"
+#line 27427 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27350,21 +27436,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27356: \$? = $ac_status" >&5
+  echo "$as_me:27442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27362: \$? = $ac_status" >&5
+  echo "$as_me:27448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27367 "configure"
+#line 27453 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27376,16 +27462,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27382: \$? = $ac_status" >&5
+  echo "$as_me:27468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27388: \$? = $ac_status" >&5
+  echo "$as_me:27474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27401,7 +27487,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27404 "configure"
+#line 27490 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27413,16 +27499,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27419: \$? = $ac_status" >&5
+  echo "$as_me:27505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27425: \$? = $ac_status" >&5
+  echo "$as_me:27511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27438,7 +27524,7 @@
 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 27441 "configure"
+#line 27527 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27450,16 +27536,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27453: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27456: \$? = $ac_status" >&5
+  echo "$as_me:27542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27462: \$? = $ac_status" >&5
+  echo "$as_me:27548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27472,12 +27558,12 @@
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27475: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27561: 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 27480 "configure"
+#line 27566 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27493,15 +27579,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27499: \$? = $ac_status" >&5
+  echo "$as_me:27585: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27504: \$? = $ac_status" >&5
+  echo "$as_me:27590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -27517,7 +27603,7 @@
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:27520: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:27606: 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
@@ -27525,23 +27611,23 @@
 
 if test "${ac_cv_type_int:+set}" = set; then
 	if test "${ac_cv_sizeof_int:+set}" != set; then
-		{ echo "$as_me:27528: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:27614: 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:27532: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:27618: 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:27538: checking for long" >&5
+echo "$as_me:27624: 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 27544 "configure"
+#line 27630 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27556,16 +27642,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27562: \$? = $ac_status" >&5
+  echo "$as_me:27648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27568: \$? = $ac_status" >&5
+  echo "$as_me:27654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -27575,10 +27661,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27578: result: $ac_cv_type_long" >&5
+echo "$as_me:27664: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:27581: checking size of long" >&5
+echo "$as_me:27667: 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
@@ -27587,7 +27673,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27590 "configure"
+#line 27676 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27599,21 +27685,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27605: \$? = $ac_status" >&5
+  echo "$as_me:27691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27611: \$? = $ac_status" >&5
+  echo "$as_me:27697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27616 "configure"
+#line 27702 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27625,16 +27711,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27631: \$? = $ac_status" >&5
+  echo "$as_me:27717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27637: \$? = $ac_status" >&5
+  echo "$as_me:27723: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27650,7 +27736,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27653 "configure"
+#line 27739 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27662,16 +27748,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27668: \$? = $ac_status" >&5
+  echo "$as_me:27754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27674: \$? = $ac_status" >&5
+  echo "$as_me:27760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27687,7 +27773,7 @@
 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 27690 "configure"
+#line 27776 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27699,16 +27785,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27705: \$? = $ac_status" >&5
+  echo "$as_me:27791: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27711: \$? = $ac_status" >&5
+  echo "$as_me:27797: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27721,12 +27807,12 @@
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27724: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27810: 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 27729 "configure"
+#line 27815 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27742,15 +27828,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27748: \$? = $ac_status" >&5
+  echo "$as_me:27834: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27753: \$? = $ac_status" >&5
+  echo "$as_me:27839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -27766,7 +27852,7 @@
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:27769: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:27855: 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
@@ -27774,23 +27860,23 @@
 
 if test "${ac_cv_type_long:+set}" = set; then
 	if test "${ac_cv_sizeof_long:+set}" != set; then
-		{ echo "$as_me:27777: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:27863: 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:27781: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:27867: 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:27787: checking for off_t" >&5
+echo "$as_me:27873: 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 27793 "configure"
+#line 27879 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27805,16 +27891,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27894: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27811: \$? = $ac_status" >&5
+  echo "$as_me:27897: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27817: \$? = $ac_status" >&5
+  echo "$as_me:27903: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27824,10 +27910,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27827: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27913: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:27830: checking size of off_t" >&5
+echo "$as_me:27916: 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
@@ -27836,7 +27922,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27839 "configure"
+#line 27925 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27848,21 +27934,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27854: \$? = $ac_status" >&5
+  echo "$as_me:27940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27860: \$? = $ac_status" >&5
+  echo "$as_me:27946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27865 "configure"
+#line 27951 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27874,16 +27960,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27880: \$? = $ac_status" >&5
+  echo "$as_me:27966: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27886: \$? = $ac_status" >&5
+  echo "$as_me:27972: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27899,7 +27985,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27902 "configure"
+#line 27988 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27911,16 +27997,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28000: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27917: \$? = $ac_status" >&5
+  echo "$as_me:28003: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27923: \$? = $ac_status" >&5
+  echo "$as_me:28009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27936,7 +28022,7 @@
 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 27939 "configure"
+#line 28025 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27948,16 +28034,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27951: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27954: \$? = $ac_status" >&5
+  echo "$as_me:28040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27960: \$? = $ac_status" >&5
+  echo "$as_me:28046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27970,12 +28056,12 @@
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27973: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28059: 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 27978 "configure"
+#line 28064 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27991,15 +28077,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27997: \$? = $ac_status" >&5
+  echo "$as_me:28083: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28002: \$? = $ac_status" >&5
+  echo "$as_me:28088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28015,7 +28101,7 @@
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28018: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28104: 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
@@ -28023,23 +28109,23 @@
 
 if test "${ac_cv_type_off_t:+set}" = set; then
 	if test "${ac_cv_sizeof_off_t:+set}" != set; then
-		{ echo "$as_me:28026: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28112: 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:28030: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28116: 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:28036: checking for time_t" >&5
+echo "$as_me:28122: 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 28042 "configure"
+#line 28128 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28054,16 +28140,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28143: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28060: \$? = $ac_status" >&5
+  echo "$as_me:28146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28066: \$? = $ac_status" >&5
+  echo "$as_me:28152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28073,10 +28159,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28076: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28162: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28079: checking size of time_t" >&5
+echo "$as_me:28165: 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
@@ -28085,7 +28171,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28088 "configure"
+#line 28174 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28097,21 +28183,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28103: \$? = $ac_status" >&5
+  echo "$as_me:28189: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28109: \$? = $ac_status" >&5
+  echo "$as_me:28195: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28114 "configure"
+#line 28200 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28123,16 +28209,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28212: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28129: \$? = $ac_status" >&5
+  echo "$as_me:28215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28135: \$? = $ac_status" >&5
+  echo "$as_me:28221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28148,7 +28234,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28151 "configure"
+#line 28237 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28160,16 +28246,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28166: \$? = $ac_status" >&5
+  echo "$as_me:28252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28172: \$? = $ac_status" >&5
+  echo "$as_me:28258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28185,7 +28271,7 @@
 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 28188 "configure"
+#line 28274 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28197,16 +28283,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28203: \$? = $ac_status" >&5
+  echo "$as_me:28289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28209: \$? = $ac_status" >&5
+  echo "$as_me:28295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28219,12 +28305,12 @@
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28222: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28308: 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 28227 "configure"
+#line 28313 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28240,15 +28326,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28246: \$? = $ac_status" >&5
+  echo "$as_me:28332: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28251: \$? = $ac_status" >&5
+  echo "$as_me:28337: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -28264,7 +28350,7 @@
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:28267: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:28353: 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
@@ -28272,23 +28358,23 @@
 
 if test "${ac_cv_type_time_t:+set}" = set; then
 	if test "${ac_cv_sizeof_time_t:+set}" != set; then
-		{ echo "$as_me:28275: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:28361: 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:28279: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:28365: 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:28285: checking for intptr_t" >&5
+echo "$as_me:28371: 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 28291 "configure"
+#line 28377 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28303,16 +28389,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28309: \$? = $ac_status" >&5
+  echo "$as_me:28395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28315: \$? = $ac_status" >&5
+  echo "$as_me:28401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -28322,7 +28408,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28325: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:28411: 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
   :
@@ -28336,13 +28422,13 @@
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:28339: checking for working alloca.h" >&5
+echo "$as_me:28425: 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 28345 "configure"
+#line 28431 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -28354,16 +28440,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28360: \$? = $ac_status" >&5
+  echo "$as_me:28446: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28366: \$? = $ac_status" >&5
+  echo "$as_me:28452: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -28373,7 +28459,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28376: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:28462: 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
 
@@ -28383,13 +28469,13 @@
 
 fi
 
-echo "$as_me:28386: checking for alloca" >&5
+echo "$as_me:28472: 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 28392 "configure"
+#line 28478 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -28421,16 +28507,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28427: \$? = $ac_status" >&5
+  echo "$as_me:28513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28433: \$? = $ac_status" >&5
+  echo "$as_me:28519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -28440,7 +28526,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28443: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:28529: 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
@@ -28461,13 +28547,13 @@
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:28464: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:28550: 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 28470 "configure"
+#line 28556 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -28485,18 +28571,18 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:28488: result: $ac_cv_os_cray" >&5
+echo "$as_me:28574: 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:28493: checking for $ac_func" >&5
+echo "$as_me:28579: 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 28499 "configure"
+#line 28585 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28527,16 +28613,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28616: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28533: \$? = $ac_status" >&5
+  echo "$as_me:28619: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28539: \$? = $ac_status" >&5
+  echo "$as_me:28625: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28546,7 +28632,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28549: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28635: 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
 
@@ -28560,7 +28646,7 @@
   done
 fi
 
-echo "$as_me:28563: checking stack direction for C alloca" >&5
+echo "$as_me:28649: 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
@@ -28569,7 +28655,7 @@
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28572 "configure"
+#line 28658 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -28592,15 +28678,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28598: \$? = $ac_status" >&5
+  echo "$as_me:28684: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28603: \$? = $ac_status" >&5
+  echo "$as_me:28689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -28612,7 +28698,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28615: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:28701: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -28624,23 +28710,23 @@
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:28627: checking for $ac_header" >&5
+echo "$as_me:28713: 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 28633 "configure"
+#line 28719 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28637: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28723: \"$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:28643: \$? = $ac_status" >&5
+  echo "$as_me:28729: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28659,7 +28745,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:28662: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28748: 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
@@ -28672,13 +28758,13 @@
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:28675: checking for $ac_func" >&5
+echo "$as_me:28761: 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 28681 "configure"
+#line 28767 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28709,16 +28795,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28715: \$? = $ac_status" >&5
+  echo "$as_me:28801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28721: \$? = $ac_status" >&5
+  echo "$as_me:28807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28728,7 +28814,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28731: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28817: 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
@@ -28740,7 +28826,7 @@
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:28743: checking for working fork" >&5
+  echo "$as_me:28829: 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
@@ -28763,15 +28849,15 @@
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28769: \$? = $ac_status" >&5
+  echo "$as_me:28855: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28774: \$? = $ac_status" >&5
+  echo "$as_me:28860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -28783,7 +28869,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28786: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:28872: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -28797,12 +28883,12 @@
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:28800: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:28886: 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:28805: checking for working vfork" >&5
+  echo "$as_me:28891: 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
@@ -28811,7 +28897,7 @@
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28814 "configure"
+#line 28900 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -28908,15 +28994,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28914: \$? = $ac_status" >&5
+  echo "$as_me:29000: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28919: \$? = $ac_status" >&5
+  echo "$as_me:29005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -28928,13 +29014,13 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28931: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29017: 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:28937: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29023: 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
 
@@ -28959,14 +29045,14 @@
 
 fi
 
-echo "$as_me:28962: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29048: 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 28969 "configure"
+#line 29055 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28983,16 +29069,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28989: \$? = $ac_status" >&5
+  echo "$as_me:29075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28995: \$? = $ac_status" >&5
+  echo "$as_me:29081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29000,7 +29086,7 @@
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29003 "configure"
+#line 29089 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29022,16 +29108,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29028: \$? = $ac_status" >&5
+  echo "$as_me:29114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29034: \$? = $ac_status" >&5
+  echo "$as_me:29120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29044,21 +29130,21 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29047: result: $cf_cv_fionbio" >&5
+echo "$as_me:29133: 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:29054: checking for broken/missing definition of remove" >&5
+echo "$as_me:29140: 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 29061 "configure"
+#line 29147 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29070,23 +29156,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29076: \$? = $ac_status" >&5
+  echo "$as_me:29162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29082: \$? = $ac_status" >&5
+  echo "$as_me:29168: \$? = $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 29089 "configure"
+#line 29175 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -29099,16 +29185,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29105: \$? = $ac_status" >&5
+  echo "$as_me:29191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29111: \$? = $ac_status" >&5
+  echo "$as_me:29197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -29123,21 +29209,21 @@
 
 fi
 
-echo "$as_me:29126: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:29212: 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:29133: checking for lstat" >&5
+echo "$as_me:29219: 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 29140 "configure"
+#line 29226 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29151,16 +29237,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29157: \$? = $ac_status" >&5
+  echo "$as_me:29243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29163: \$? = $ac_status" >&5
+  echo "$as_me:29249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -29172,7 +29258,7 @@
 
 fi
 
-echo "$as_me:29175: result: $ac_cv_func_lstat " >&5
+echo "$as_me:29261: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -29207,13 +29293,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29210: checking for $ac_func" >&5
+echo "$as_me:29296: 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 29216 "configure"
+#line 29302 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29244,16 +29330,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29250: \$? = $ac_status" >&5
+  echo "$as_me:29336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29256: \$? = $ac_status" >&5
+  echo "$as_me:29342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29263,7 +29349,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29266: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29352: 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
@@ -29279,13 +29365,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29282: checking for $ac_func" >&5
+echo "$as_me:29368: 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 29288 "configure"
+#line 29374 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29316,16 +29402,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29322: \$? = $ac_status" >&5
+  echo "$as_me:29408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29328: \$? = $ac_status" >&5
+  echo "$as_me:29414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29335,7 +29421,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29338: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29424: 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
@@ -29347,7 +29433,7 @@
 fi
 done
 
-echo "$as_me:29350: checking for random-integer functions" >&5
+echo "$as_me:29436: 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
@@ -29367,7 +29453,7 @@
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29370 "configure"
+#line 29456 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29386,16 +29472,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29392: \$? = $ac_status" >&5
+  echo "$as_me:29478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29398: \$? = $ac_status" >&5
+  echo "$as_me:29484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -29407,10 +29493,10 @@
 done
 
 fi
-echo "$as_me:29410: result: $cf_cv_srand_func" >&5
+echo "$as_me:29496: 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:29413: checking for range of random-integers" >&5
+	echo "$as_me:29499: 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
@@ -29431,7 +29517,7 @@
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29434 "configure"
+#line 29520 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29450,16 +29536,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29453: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29456: \$? = $ac_status" >&5
+  echo "$as_me:29542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29462: \$? = $ac_status" >&5
+  echo "$as_me:29548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29470,15 +29556,15 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29473: result: $cf_cv_rand_max" >&5
+echo "$as_me:29559: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	*/arc4random)
-		echo "$as_me:29478: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:29564: 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 29481 "configure"
+#line 29567 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29491,23 +29577,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29497: \$? = $ac_status" >&5
+  echo "$as_me:29583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29503: \$? = $ac_status" >&5
+  echo "$as_me:29589: \$? = $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 29510 "configure"
+#line 29596 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29519,16 +29605,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29525: \$? = $ac_status" >&5
+  echo "$as_me:29611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29531: \$? = $ac_status" >&5
+  echo "$as_me:29617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -29539,7 +29625,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:29542: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:29628: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -29549,10 +29635,10 @@
 EOF
 
 		else
-			echo "$as_me:29552: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:29638: 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 29555 "configure"
+#line 29641 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29565,23 +29651,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29571: \$? = $ac_status" >&5
+  echo "$as_me:29657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29577: \$? = $ac_status" >&5
+  echo "$as_me:29663: \$? = $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 29584 "configure"
+#line 29670 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29593,16 +29679,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29599: \$? = $ac_status" >&5
+  echo "$as_me:29685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29605: \$? = $ac_status" >&5
+  echo "$as_me:29691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -29613,7 +29699,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:29616: result: $cf_bsd_random_h" >&5
+			echo "$as_me:29702: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -29623,7 +29709,7 @@
 EOF
 
 			else
-				{ echo "$as_me:29626: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:29712: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -29658,13 +29744,13 @@
 for ac_func in sleep
 do
 
-echo "$as_me:29661: checking for $ac_func declaration" >&5
+echo "$as_me:29747: 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 29667 "configure"
+#line 29753 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29685,20 +29771,20 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29691: \$? = $ac_status" >&5
+  echo "$as_me:29777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29697: \$? = $ac_status" >&5
+  echo "$as_me:29783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29701 "configure"
+#line 29787 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29719,16 +29805,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29725: \$? = $ac_status" >&5
+  echo "$as_me:29811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29731: \$? = $ac_status" >&5
+  echo "$as_me:29817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -29749,11 +29835,11 @@
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:29752: result: yes" >&5
+  echo "$as_me:29838: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:29756: result: no" >&5
+  echo "$as_me:29842: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -29768,13 +29854,13 @@
 for ac_func in strstr
 do
 
-echo "$as_me:29771: checking for $ac_func declaration" >&5
+echo "$as_me:29857: 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 29777 "configure"
+#line 29863 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -29788,20 +29874,20 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29877: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29794: \$? = $ac_status" >&5
+  echo "$as_me:29880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29800: \$? = $ac_status" >&5
+  echo "$as_me:29886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29804 "configure"
+#line 29890 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -29815,16 +29901,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29821: \$? = $ac_status" >&5
+  echo "$as_me:29907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29827: \$? = $ac_status" >&5
+  echo "$as_me:29913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -29845,11 +29931,11 @@
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:29848: result: yes" >&5
+  echo "$as_me:29934: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:29852: result: no" >&5
+  echo "$as_me:29938: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -29864,13 +29950,13 @@
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:29867: checking for $ac_func declaration" >&5
+echo "$as_me:29953: 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 29873 "configure"
+#line 29959 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -29886,20 +29972,20 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29892: \$? = $ac_status" >&5
+  echo "$as_me:29978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29898: \$? = $ac_status" >&5
+  echo "$as_me:29984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29902 "configure"
+#line 29988 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -29915,16 +30001,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29921: \$? = $ac_status" >&5
+  echo "$as_me:30007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29927: \$? = $ac_status" >&5
+  echo "$as_me:30013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -29945,11 +30031,11 @@
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:29948: result: yes" >&5
+  echo "$as_me:30034: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:29952: result: no" >&5
+  echo "$as_me:30038: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -29961,14 +30047,14 @@
 fi
 done
 
-echo "$as_me:29964: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30050: 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 29971 "configure"
+#line 30057 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -29982,16 +30068,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29988: \$? = $ac_status" >&5
+  echo "$as_me:30074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29994: \$? = $ac_status" >&5
+  echo "$as_me:30080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30002,7 +30088,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30005: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30091: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30016,14 +30102,14 @@
 
 fi
 
-echo "$as_me:30019: checking if external errno is declared" >&5
+echo "$as_me:30105: 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 30026 "configure"
+#line 30112 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30041,16 +30127,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30047: \$? = $ac_status" >&5
+  echo "$as_me:30133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30053: \$? = $ac_status" >&5
+  echo "$as_me:30139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30061,7 +30147,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30064: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30150: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -30076,14 +30162,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30079: checking if external errno exists" >&5
+echo "$as_me:30165: 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 30086 "configure"
+#line 30172 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -30098,16 +30184,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30104: \$? = $ac_status" >&5
+  echo "$as_me:30190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30110: \$? = $ac_status" >&5
+  echo "$as_me:30196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -30118,7 +30204,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30121: result: $cf_cv_have_errno" >&5
+echo "$as_me:30207: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -30131,7 +30217,7 @@
 
 fi
 
-echo "$as_me:30134: checking if we can set errno" >&5
+echo "$as_me:30220: 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
@@ -30139,7 +30225,7 @@
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 30142 "configure"
+#line 30228 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -30151,16 +30237,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30157: \$? = $ac_status" >&5
+  echo "$as_me:30243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30163: \$? = $ac_status" >&5
+  echo "$as_me:30249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -30171,7 +30257,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30174 "configure"
+#line 30260 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -30182,15 +30268,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30188: \$? = $ac_status" >&5
+  echo "$as_me:30274: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30193: \$? = $ac_status" >&5
+  echo "$as_me:30279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -30203,21 +30289,21 @@
 fi
 
 fi
-echo "$as_me:30206: result: $cf_cv_set_errno" >&5
+echo "$as_me:30292: 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:30213: checking for setlocale()" >&5
+echo "$as_me:30299: 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 30220 "configure"
+#line 30306 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -30229,16 +30315,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30235: \$? = $ac_status" >&5
+  echo "$as_me:30321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30241: \$? = $ac_status" >&5
+  echo "$as_me:30327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -30250,7 +30336,7 @@
 
 fi
 
-echo "$as_me:30253: result: $cf_cv_locale" >&5
+echo "$as_me:30339: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -30258,14 +30344,14 @@
 EOF
  }
 
-echo "$as_me:30261: checking if NGROUPS is defined" >&5
+echo "$as_me:30347: 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 30268 "configure"
+#line 30354 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30284,23 +30370,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30373: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30290: \$? = $ac_status" >&5
+  echo "$as_me:30376: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30296: \$? = $ac_status" >&5
+  echo "$as_me:30382: \$? = $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 30303 "configure"
+#line 30389 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30319,16 +30405,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30325: \$? = $ac_status" >&5
+  echo "$as_me:30411: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30331: \$? = $ac_status" >&5
+  echo "$as_me:30417: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -30340,7 +30426,7 @@
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:30343: result: $cf_cv_ngroups" >&5
+echo "$as_me:30429: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -30358,14 +30444,14 @@
 
 fi
 
-echo "$as_me:30361: checking if external sys_nerr is declared" >&5
+echo "$as_me:30447: 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 30368 "configure"
+#line 30454 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30383,16 +30469,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30389: \$? = $ac_status" >&5
+  echo "$as_me:30475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30395: \$? = $ac_status" >&5
+  echo "$as_me:30481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -30403,7 +30489,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30406: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:30492: 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
@@ -30418,14 +30504,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30421: checking if external sys_nerr exists" >&5
+echo "$as_me:30507: 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 30428 "configure"
+#line 30514 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -30440,16 +30526,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30446: \$? = $ac_status" >&5
+  echo "$as_me:30532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30452: \$? = $ac_status" >&5
+  echo "$as_me:30538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -30460,7 +30546,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30463: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:30549: 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
@@ -30473,14 +30559,14 @@
 
 fi
 
-echo "$as_me:30476: checking if external sys_errlist is declared" >&5
+echo "$as_me:30562: 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 30483 "configure"
+#line 30569 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30498,16 +30584,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30504: \$? = $ac_status" >&5
+  echo "$as_me:30590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30510: \$? = $ac_status" >&5
+  echo "$as_me:30596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -30518,7 +30604,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30521: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:30607: 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
@@ -30533,14 +30619,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30536: checking if external sys_errlist exists" >&5
+echo "$as_me:30622: 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 30543 "configure"
+#line 30629 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -30555,16 +30641,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30561: \$? = $ac_status" >&5
+  echo "$as_me:30647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30567: \$? = $ac_status" >&5
+  echo "$as_me:30653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -30575,7 +30661,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30578: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:30664: 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
@@ -30591,23 +30677,23 @@
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:30594: checking for $ac_header" >&5
+echo "$as_me:30680: 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 30600 "configure"
+#line 30686 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30604: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30690: \"$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:30610: \$? = $ac_status" >&5
+  echo "$as_me:30696: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30626,7 +30712,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30629: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30715: 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
@@ -30636,14 +30722,14 @@
 fi
 done
 
-echo "$as_me:30639: checking for lastlog path" >&5
+echo "$as_me:30725: 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 30646 "configure"
+#line 30732 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30663,16 +30749,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30669: \$? = $ac_status" >&5
+  echo "$as_me:30755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30675: \$? = $ac_status" >&5
+  echo "$as_me:30761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -30687,14 +30773,14 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30690: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:30776: 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:30697: checking for utmp implementation" >&5
+echo "$as_me:30783: 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
@@ -30711,7 +30797,7 @@
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30714 "configure"
+#line 30800 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30725,16 +30811,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30728: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30731: \$? = $ac_status" >&5
+  echo "$as_me:30817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30737: \$? = $ac_status" >&5
+  echo "$as_me:30823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -30743,7 +30829,7 @@
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30746 "configure"
+#line 30832 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30757,16 +30843,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30763: \$? = $ac_status" >&5
+  echo "$as_me:30849: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30769: \$? = $ac_status" >&5
+  echo "$as_me:30855: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -30781,7 +30867,7 @@
 done
 
 fi
-echo "$as_me:30784: result: $cf_cv_have_utmp" >&5
+echo "$as_me:30870: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -30796,14 +30882,14 @@
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30799: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:30885: 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 30806 "configure"
+#line 30892 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30817,16 +30903,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30823: \$? = $ac_status" >&5
+  echo "$as_me:30909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30829: \$? = $ac_status" >&5
+  echo "$as_me:30915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -30838,7 +30924,7 @@
 
 fi
 
-echo "$as_me:30841: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:30927: 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
@@ -30848,14 +30934,14 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30851: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:30937: 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 30858 "configure"
+#line 30944 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30869,16 +30955,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30875: \$? = $ac_status" >&5
+  echo "$as_me:30961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30881: \$? = $ac_status" >&5
+  echo "$as_me:30967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -30890,7 +30976,7 @@
 
 fi
 
-echo "$as_me:30893: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:30979: 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
@@ -30900,7 +30986,7 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30903: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:30989: 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
@@ -30917,7 +31003,7 @@
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30920 "configure"
+#line 31006 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30931,16 +31017,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30937: \$? = $ac_status" >&5
+  echo "$as_me:31023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30943: \$? = $ac_status" >&5
+  echo "$as_me:31029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -30952,12 +31038,12 @@
 done
 
 fi
-echo "$as_me:30955: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31041: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:30960: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31046: 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; }; }
 	;;
@@ -30972,7 +31058,7 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30975: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31061: 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
@@ -30985,7 +31071,7 @@
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 30988 "configure"
+#line 31074 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30999,16 +31085,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31088: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31005: \$? = $ac_status" >&5
+  echo "$as_me:31091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31011: \$? = $ac_status" >&5
+  echo "$as_me:31097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31021,7 +31107,7 @@
 done
 
 fi
-echo "$as_me:31024: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31110: 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
 
@@ -31037,14 +31123,14 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31040: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31126: 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 31047 "configure"
+#line 31133 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31058,23 +31144,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31064: \$? = $ac_status" >&5
+  echo "$as_me:31150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31070: \$? = $ac_status" >&5
+  echo "$as_me:31156: \$? = $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 31077 "configure"
+#line 31163 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31088,16 +31174,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31094: \$? = $ac_status" >&5
+  echo "$as_me:31180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31100: \$? = $ac_status" >&5
+  echo "$as_me:31186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -31111,7 +31197,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31114: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:31200: 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
 
@@ -31130,14 +31216,14 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31133: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:31219: 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 31140 "configure"
+#line 31226 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31151,16 +31237,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31157: \$? = $ac_status" >&5
+  echo "$as_me:31243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31163: \$? = $ac_status" >&5
+  echo "$as_me:31249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -31171,7 +31257,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31174: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:31260: 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
 
@@ -31182,7 +31268,7 @@
 fi
 fi
 
-echo "$as_me:31185: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:31271: 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
@@ -31190,7 +31276,7 @@
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31193 "configure"
+#line 31279 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31209,16 +31295,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31215: \$? = $ac_status" >&5
+  echo "$as_me:31301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31221: \$? = $ac_status" >&5
+  echo "$as_me:31307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -31229,7 +31315,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31232: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:31318: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -31238,14 +31324,14 @@
 
 fi
 
-echo "$as_me:31241: checking if external h_errno exists" >&5
+echo "$as_me:31327: 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 31248 "configure"
+#line 31334 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -31260,16 +31346,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31266: \$? = $ac_status" >&5
+  echo "$as_me:31352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31272: \$? = $ac_status" >&5
+  echo "$as_me:31358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -31280,7 +31366,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31283: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:31369: 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
@@ -31293,7 +31379,7 @@
 
 fi
 
-echo "$as_me:31296: checking if bibp: URLs should be supported" >&5
+echo "$as_me:31382: 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.
@@ -31310,14 +31396,14 @@
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:31313: result: $use_bibp_urls" >&5
+echo "$as_me:31399: 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:31320: checking if configuration info should be browsable" >&5
+echo "$as_me:31406: 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.
@@ -31334,14 +31420,14 @@
   use_config_info=yes
 
 fi;
-echo "$as_me:31337: result: $use_config_info" >&5
+echo "$as_me:31423: 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:31344: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:31430: 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.
@@ -31358,14 +31444,14 @@
   use_forms_options=yes
 
 fi;
-echo "$as_me:31361: result: $use_forms_options" >&5
+echo "$as_me:31447: 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:31368: checking if old-style options menu should be used" >&5
+echo "$as_me:31454: 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.
@@ -31382,14 +31468,14 @@
   use_menu_options=yes
 
 fi;
-echo "$as_me:31385: result: $use_menu_options" >&5
+echo "$as_me:31471: 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:31392: checking if sessions code should be used" >&5
+echo "$as_me:31478: 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.
@@ -31406,7 +31492,7 @@
   use_sessions=yes
 
 fi;
-echo "$as_me:31409: result: $use_sessions" >&5
+echo "$as_me:31495: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -31417,7 +31503,7 @@
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:31420: checking if session-caching code should be used" >&5
+echo "$as_me:31506: 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.
@@ -31434,7 +31520,7 @@
   use_session_cache=yes
 
 fi;
-echo "$as_me:31437: result: $use_session_cache" >&5
+echo "$as_me:31523: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -31444,7 +31530,7 @@
 
 fi
 
-echo "$as_me:31447: checking if address-list page should be used" >&5
+echo "$as_me:31533: 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.
@@ -31461,14 +31547,14 @@
   use_addrlist_page=yes
 
 fi;
-echo "$as_me:31464: result: $use_addrlist_page" >&5
+echo "$as_me:31550: 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:31471: checking if experimental CJK logic should be used" >&5
+echo "$as_me:31557: 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.
@@ -31485,14 +31571,14 @@
   use_cjk=no
 
 fi;
-echo "$as_me:31488: result: $use_cjk" >&5
+echo "$as_me:31574: 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:31495: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:31581: 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.
@@ -31509,7 +31595,7 @@
   use_ja_utf8=no
 
 fi;
-echo "$as_me:31512: result: $use_ja_utf8" >&5
+echo "$as_me:31598: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -31555,7 +31641,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31558 "configure"
+#line 31644 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31567,16 +31653,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31573: \$? = $ac_status" >&5
+  echo "$as_me:31659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31579: \$? = $ac_status" >&5
+  echo "$as_me:31665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31593,7 +31679,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:31596: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31682: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31634,7 +31720,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31637 "configure"
+#line 31723 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31646,16 +31732,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31735: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31652: \$? = $ac_status" >&5
+  echo "$as_me:31738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31658: \$? = $ac_status" >&5
+  echo "$as_me:31744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31672,7 +31758,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:31675: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31761: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31688,7 +31774,7 @@
 fi
 
 	else
-{ { echo "$as_me:31691: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:31777: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31713,7 +31799,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:31716: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31802: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31742,7 +31828,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:31745: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31831: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31751,7 +31837,7 @@
 fi
 
 	else
-{ { echo "$as_me:31754: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:31840: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31762,7 +31848,7 @@
 
 fi;
 
-  echo "$as_me:31765: checking for iconv" >&5
+  echo "$as_me:31851: 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
@@ -31773,12 +31859,12 @@
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:31776: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:31862: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31781 "configure"
+#line 31867 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31797,16 +31883,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31803: \$? = $ac_status" >&5
+  echo "$as_me:31889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31809: \$? = $ac_status" >&5
+  echo "$as_me:31895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -31820,7 +31906,7 @@
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31823 "configure"
+#line 31909 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31839,16 +31925,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31845: \$? = $ac_status" >&5
+  echo "$as_me:31931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31851: \$? = $ac_status" >&5
+  echo "$as_me:31937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -31865,9 +31951,9 @@
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:31868: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:31954: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:31870: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:31956: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31904,17 +31990,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/iconv &&       cf_search="$cf_search /usr/include/iconv"
-	test -d /usr/include/iconv/include &&    cf_search="$cf_search /usr/include/iconv/include"
-	test -d /usr/iconv/include &&       cf_search="$cf_search /usr/iconv/include"
-	test -d /usr/iconv/include/iconv &&    cf_search="$cf_search /usr/iconv/include/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -31926,39 +32001,28 @@
 	test -d $prefix/iconv/include/iconv &&    cf_search="$cf_search $prefix/iconv/include/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/iconv &&       cf_search="$cf_search /usr/local/include/iconv"
-	test -d /usr/local/include/iconv/include &&    cf_search="$cf_search /usr/local/include/iconv/include"
-	test -d /usr/local/iconv/include &&       cf_search="$cf_search /usr/local/iconv/include"
-	test -d /usr/local/iconv/include/iconv &&    cf_search="$cf_search /usr/local/iconv/include/iconv"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/iconv &&       cf_search="$cf_search /opt/include/iconv"
-	test -d /opt/include/iconv/include &&    cf_search="$cf_search /opt/include/iconv/include"
-	test -d /opt/iconv/include &&       cf_search="$cf_search /opt/iconv/include"
-	test -d /opt/iconv/include/iconv &&    cf_search="$cf_search /opt/iconv/include/iconv"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/iconv &&       cf_search="$cf_search $HOME/include/iconv"
-	test -d $HOME/include/iconv/include &&    cf_search="$cf_search $HOME/include/iconv/include"
-	test -d $HOME/iconv/include &&       cf_search="$cf_search $HOME/iconv/include"
-	test -d $HOME/iconv/include/iconv &&    cf_search="$cf_search $HOME/iconv/include/iconv"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/iconv &&       cf_search="$cf_search $cf_subdir_prefix/include/iconv"
+	test -d $cf_subdir_prefix/include/iconv/include &&    cf_search="$cf_search $cf_subdir_prefix/include/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include &&       cf_search="$cf_search $cf_subdir_prefix/iconv/include"
+	test -d $cf_subdir_prefix/iconv/include/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -31980,11 +32044,11 @@
       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}:31983: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32047: 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 31987 "configure"
+#line 32051 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32003,21 +32067,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32009: \$? = $ac_status" >&5
+  echo "$as_me:32073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32015: \$? = $ac_status" >&5
+  echo "$as_me:32079: \$? = $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}:32020: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32084: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32035,7 +32099,7 @@
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32038: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32102: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -32070,17 +32134,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/iconv &&       cf_search="$cf_search /usr/lib/iconv"
-	test -d /usr/lib/iconv/lib &&    cf_search="$cf_search /usr/lib/iconv/lib"
-	test -d /usr/iconv/lib &&       cf_search="$cf_search /usr/iconv/lib"
-	test -d /usr/iconv/lib/iconv &&    cf_search="$cf_search /usr/iconv/lib/iconv"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -32092,39 +32145,28 @@
 	test -d $prefix/iconv/lib/iconv &&    cf_search="$cf_search $prefix/iconv/lib/iconv"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/iconv &&       cf_search="$cf_search /usr/local/lib/iconv"
-	test -d /usr/local/lib/iconv/lib &&    cf_search="$cf_search /usr/local/lib/iconv/lib"
-	test -d /usr/local/iconv/lib &&       cf_search="$cf_search /usr/local/iconv/lib"
-	test -d /usr/local/iconv/lib/iconv &&    cf_search="$cf_search /usr/local/iconv/lib/iconv"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/iconv &&       cf_search="$cf_search /opt/lib/iconv"
-	test -d /opt/lib/iconv/lib &&    cf_search="$cf_search /opt/lib/iconv/lib"
-	test -d /opt/iconv/lib &&       cf_search="$cf_search /opt/iconv/lib"
-	test -d /opt/iconv/lib/iconv &&    cf_search="$cf_search /opt/iconv/lib/iconv"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/iconv &&       cf_search="$cf_search $HOME/lib/iconv"
-	test -d $HOME/lib/iconv/lib &&    cf_search="$cf_search $HOME/lib/iconv/lib"
-	test -d $HOME/iconv/lib &&       cf_search="$cf_search $HOME/iconv/lib"
-	test -d $HOME/iconv/lib/iconv &&    cf_search="$cf_search $HOME/iconv/lib/iconv"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/iconv &&       cf_search="$cf_search $cf_subdir_prefix/lib/iconv"
+	test -d $cf_subdir_prefix/lib/iconv/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib &&       cf_search="$cf_search $cf_subdir_prefix/iconv/lib"
+	test -d $cf_subdir_prefix/iconv/lib/iconv &&    cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_iconv in $cf_search
@@ -32132,13 +32174,13 @@
           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}:32135: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32177: 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 32141 "configure"
+#line 32183 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32157,21 +32199,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32163: \$? = $ac_status" >&5
+  echo "$as_me:32205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32169: \$? = $ac_status" >&5
+  echo "$as_me:32211: \$? = $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}:32174: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32216: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -32211,7 +32253,7 @@
 fi
 
 fi
-echo "$as_me:32214: result: $am_cv_func_iconv" >&5
+echo "$as_me:32256: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -32220,14 +32262,14 @@
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:32223: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:32265: 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 32230 "configure"
+#line 32272 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32252,16 +32294,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32297: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32258: \$? = $ac_status" >&5
+  echo "$as_me:32300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32264: \$? = $ac_status" >&5
+  echo "$as_me:32306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -32271,7 +32313,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32274: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:32316: 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
@@ -32313,7 +32355,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32316 "configure"
+#line 32358 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32325,16 +32367,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32331: \$? = $ac_status" >&5
+  echo "$as_me:32373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32337: \$? = $ac_status" >&5
+  echo "$as_me:32379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32351,7 +32393,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32354: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32396: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32388,7 +32430,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32391: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32433: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32412,7 +32454,7 @@
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:32415: checking if you want to use default-colors" >&5
+echo "$as_me:32457: 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.
@@ -32429,7 +32471,7 @@
   use_dft_colors=no
 
 fi;
-echo "$as_me:32432: result: $use_dft_colors" >&5
+echo "$as_me:32474: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -32438,7 +32480,7 @@
 
 fi
 
-echo "$as_me:32441: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:32483: 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.
@@ -32455,14 +32497,14 @@
   use_kbd_layout=no
 
 fi;
-echo "$as_me:32458: result: $use_kbd_layout" >&5
+echo "$as_me:32500: 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:32465: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:32507: 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.
@@ -32479,14 +32521,14 @@
   use_nested_tables=no
 
 fi;
-echo "$as_me:32482: result: $use_nested_tables" >&5
+echo "$as_me:32524: 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:32489: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:32531: 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.
@@ -32503,14 +32545,14 @@
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:32506: result: $use_alt_bindings" >&5
+echo "$as_me:32548: 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:32513: checking if ascii case-conversion should be used" >&5
+echo "$as_me:32555: 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.
@@ -32527,14 +32569,14 @@
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:32530: result: $use_ascii_ctypes" >&5
+echo "$as_me:32572: 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:32537: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:32579: 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.
@@ -32551,14 +32593,14 @@
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:32554: result: $use_ext_htmldtd" >&5
+echo "$as_me:32596: 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:32561: checking if file-upload logic should be used" >&5
+echo "$as_me:32603: 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.
@@ -32575,14 +32617,14 @@
   use_file_upload=yes
 
 fi;
-echo "$as_me:32578: result: $use_file_upload" >&5
+echo "$as_me:32620: 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:32585: checking if IDNA support should be used" >&5
+echo "$as_me:32627: 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.
@@ -32599,7 +32641,7 @@
   use_idna=yes
 
 fi;
-echo "$as_me:32602: result: $use_idna" >&5
+echo "$as_me:32644: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -32638,7 +32680,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32641 "configure"
+#line 32683 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32650,16 +32692,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32656: \$? = $ac_status" >&5
+  echo "$as_me:32698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32662: \$? = $ac_status" >&5
+  echo "$as_me:32704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32676,7 +32718,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32679: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32721: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32717,7 +32759,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32720 "configure"
+#line 32762 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32729,16 +32771,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32732: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32735: \$? = $ac_status" >&5
+  echo "$as_me:32777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32741: \$? = $ac_status" >&5
+  echo "$as_me:32783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32755,7 +32797,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32758: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32800: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32771,7 +32813,7 @@
 fi
 
 	else
-{ { echo "$as_me:32774: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:32816: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32796,7 +32838,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32799: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32841: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32825,7 +32867,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32828: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32870: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32834,7 +32876,7 @@
 fi
 
 	else
-{ { echo "$as_me:32837: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:32879: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32848,12 +32890,12 @@
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:32851: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:32893: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32856 "configure"
+#line 32898 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32871,16 +32913,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32877: \$? = $ac_status" >&5
+  echo "$as_me:32919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32883: \$? = $ac_status" >&5
+  echo "$as_me:32925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -32894,7 +32936,7 @@
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32897 "configure"
+#line 32939 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32912,16 +32954,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32918: \$? = $ac_status" >&5
+  echo "$as_me:32960: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32924: \$? = $ac_status" >&5
+  echo "$as_me:32966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -32938,9 +32980,9 @@
 
     test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:32941: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:32983: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:32943: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:32985: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32977,17 +33019,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/idn &&       cf_search="$cf_search /usr/include/idn"
-	test -d /usr/include/idn/include &&    cf_search="$cf_search /usr/include/idn/include"
-	test -d /usr/idn/include &&       cf_search="$cf_search /usr/idn/include"
-	test -d /usr/idn/include/idn &&    cf_search="$cf_search /usr/idn/include/idn"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -32999,39 +33030,28 @@
 	test -d $prefix/idn/include/idn &&    cf_search="$cf_search $prefix/idn/include/idn"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/idn &&       cf_search="$cf_search /usr/local/include/idn"
-	test -d /usr/local/include/idn/include &&    cf_search="$cf_search /usr/local/include/idn/include"
-	test -d /usr/local/idn/include &&       cf_search="$cf_search /usr/local/idn/include"
-	test -d /usr/local/idn/include/idn &&    cf_search="$cf_search /usr/local/idn/include/idn"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/idn &&       cf_search="$cf_search /opt/include/idn"
-	test -d /opt/include/idn/include &&    cf_search="$cf_search /opt/include/idn/include"
-	test -d /opt/idn/include &&       cf_search="$cf_search /opt/idn/include"
-	test -d /opt/idn/include/idn &&    cf_search="$cf_search /opt/idn/include/idn"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/idn &&       cf_search="$cf_search $HOME/include/idn"
-	test -d $HOME/include/idn/include &&    cf_search="$cf_search $HOME/include/idn/include"
-	test -d $HOME/idn/include &&       cf_search="$cf_search $HOME/idn/include"
-	test -d $HOME/idn/include/idn &&    cf_search="$cf_search $HOME/idn/include/idn"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/idn &&       cf_search="$cf_search $cf_subdir_prefix/include/idn"
+	test -d $cf_subdir_prefix/include/idn/include &&    cf_search="$cf_search $cf_subdir_prefix/include/idn/include"
+	test -d $cf_subdir_prefix/idn/include &&       cf_search="$cf_search $cf_subdir_prefix/idn/include"
+	test -d $cf_subdir_prefix/idn/include/idn &&    cf_search="$cf_search $cf_subdir_prefix/idn/include/idn"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -33053,11 +33073,11 @@
       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}:33056: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33076: 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 33060 "configure"
+#line 33080 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33075,21 +33095,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33081: \$? = $ac_status" >&5
+  echo "$as_me:33101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33087: \$? = $ac_status" >&5
+  echo "$as_me:33107: \$? = $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}:33092: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33112: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
             cf_cv_find_linkage_idn=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33107,7 +33127,7 @@
 
     if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33110: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33130: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -33142,17 +33162,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/idn &&       cf_search="$cf_search /usr/lib/idn"
-	test -d /usr/lib/idn/lib &&    cf_search="$cf_search /usr/lib/idn/lib"
-	test -d /usr/idn/lib &&       cf_search="$cf_search /usr/idn/lib"
-	test -d /usr/idn/lib/idn &&    cf_search="$cf_search /usr/idn/lib/idn"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -33164,39 +33173,28 @@
 	test -d $prefix/idn/lib/idn &&    cf_search="$cf_search $prefix/idn/lib/idn"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/idn &&       cf_search="$cf_search /usr/local/lib/idn"
-	test -d /usr/local/lib/idn/lib &&    cf_search="$cf_search /usr/local/lib/idn/lib"
-	test -d /usr/local/idn/lib &&       cf_search="$cf_search /usr/local/idn/lib"
-	test -d /usr/local/idn/lib/idn &&    cf_search="$cf_search /usr/local/idn/lib/idn"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/idn &&       cf_search="$cf_search /opt/lib/idn"
-	test -d /opt/lib/idn/lib &&    cf_search="$cf_search /opt/lib/idn/lib"
-	test -d /opt/idn/lib &&       cf_search="$cf_search /opt/idn/lib"
-	test -d /opt/idn/lib/idn &&    cf_search="$cf_search /opt/idn/lib/idn"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/idn &&       cf_search="$cf_search $HOME/lib/idn"
-	test -d $HOME/lib/idn/lib &&    cf_search="$cf_search $HOME/lib/idn/lib"
-	test -d $HOME/idn/lib &&       cf_search="$cf_search $HOME/idn/lib"
-	test -d $HOME/idn/lib/idn &&    cf_search="$cf_search $HOME/idn/lib/idn"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/idn &&       cf_search="$cf_search $cf_subdir_prefix/lib/idn"
+	test -d $cf_subdir_prefix/lib/idn/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/idn/lib"
+	test -d $cf_subdir_prefix/idn/lib &&       cf_search="$cf_search $cf_subdir_prefix/idn/lib"
+	test -d $cf_subdir_prefix/idn/lib/idn &&    cf_search="$cf_search $cf_subdir_prefix/idn/lib/idn"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_idn in $cf_search
@@ -33204,13 +33202,13 @@
           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}:33207: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33205: 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 33213 "configure"
+#line 33211 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33228,21 +33226,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33234: \$? = $ac_status" >&5
+  echo "$as_me:33232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33240: \$? = $ac_status" >&5
+  echo "$as_me:33238: \$? = $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}:33245: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33243: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
                 cf_cv_find_linkage_idn=yes
                 cf_cv_library_file_idn="-lidn"
@@ -33301,7 +33299,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33304 "configure"
+#line 33302 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33313,16 +33311,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33316: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33319: \$? = $ac_status" >&5
+  echo "$as_me:33317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33325: \$? = $ac_status" >&5
+  echo "$as_me:33323: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33339,7 +33337,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:33342: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33340: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33373,7 +33371,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33376: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33374: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33381,10 +33379,24 @@
   done
 fi
 
-	LIBS="-lidn $LIBS"
+cf_add_libs="-lidn"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:33387: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:33399: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -33398,7 +33410,7 @@
 
 fi
 
-echo "$as_me:33401: checking if element-justification logic should be used" >&5
+echo "$as_me:33413: 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.
@@ -33415,14 +33427,14 @@
   use_justify_elts=yes
 
 fi;
-echo "$as_me:33418: result: $use_justify_elts" >&5
+echo "$as_me:33430: 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:33425: checking if partial-display should be used" >&5
+echo "$as_me:33437: 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.
@@ -33439,14 +33451,14 @@
   use_partial_display=yes
 
 fi;
-echo "$as_me:33442: result: $use_partial_display" >&5
+echo "$as_me:33454: 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:33449: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:33461: 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.
@@ -33463,14 +33475,14 @@
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:33466: result: $use_filed_cookies" >&5
+echo "$as_me:33478: 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:33473: checking if html source should be colorized" >&5
+echo "$as_me:33485: 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.
@@ -33487,14 +33499,14 @@
   use_prettysrc=yes
 
 fi;
-echo "$as_me:33490: result: $use_prettysrc" >&5
+echo "$as_me:33502: 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:33497: checking if progress-bar code should be used" >&5
+echo "$as_me:33509: 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.
@@ -33511,14 +33523,14 @@
   use_progressbar=yes
 
 fi;
-echo "$as_me:33514: result: $use_progressbar" >&5
+echo "$as_me:33526: 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:33521: checking if read-progress message should show ETA" >&5
+echo "$as_me:33533: 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.
@@ -33535,14 +33547,14 @@
   use_read_eta=yes
 
 fi;
-echo "$as_me:33538: result: $use_read_eta" >&5
+echo "$as_me:33550: 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:33545: checking if source caching should be used" >&5
+echo "$as_me:33557: 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.
@@ -33559,14 +33571,14 @@
   use_source_cache=yes
 
 fi;
-echo "$as_me:33562: result: $use_source_cache" >&5
+echo "$as_me:33574: 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:33569: checking if scrollbar code should be used" >&5
+echo "$as_me:33581: 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.
@@ -33583,10 +33595,10 @@
   use_scrollbar=yes
 
 fi;
-echo "$as_me:33586: result: $use_scrollbar" >&5
+echo "$as_me:33598: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:33589: checking if charset-selection logic should be used" >&5
+echo "$as_me:33601: 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.
@@ -33603,14 +33615,14 @@
   use_charset_choice=no
 
 fi;
-echo "$as_me:33606: result: $use_charset_choice" >&5
+echo "$as_me:33618: 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:33613: checking if you want to use external commands" >&5
+echo "$as_me:33625: 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.
@@ -33627,7 +33639,7 @@
   use_externs=no
 
 fi;
-echo "$as_me:33630: result: $use_externs" >&5
+echo "$as_me:33642: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -33638,7 +33650,7 @@
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:33641: checking if you want to use setfont support" >&5
+echo "$as_me:33653: 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.
@@ -33655,7 +33667,7 @@
   use_setfont=no
 
 fi;
-echo "$as_me:33658: result: $use_setfont" >&5
+echo "$as_me:33670: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -33666,7 +33678,7 @@
 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:33669: checking for $ac_word" >&5
+echo "$as_me:33681: 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
@@ -33683,7 +33695,7 @@
   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:33686: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33698: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33694,10 +33706,10 @@
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:33697: result: $SETFONT" >&5
+  echo "$as_me:33709: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:33700: result: no" >&5
+  echo "$as_me:33712: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -33756,7 +33768,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:33759: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:33771: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -33774,19 +33786,19 @@
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:33777: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:33789: 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}:33784: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:33796: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:33789: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:33801: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -33797,7 +33809,7 @@
 	fi
 fi
 
-echo "$as_me:33800: checking if you want cgi-link support" >&5
+echo "$as_me:33812: 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.
@@ -33814,10 +33826,10 @@
 else
   enableval=no
 fi;
-echo "$as_me:33817: result: $enableval" >&5
+echo "$as_me:33829: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:33820: checking if you want change-exec support" >&5
+echo "$as_me:33832: 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.
@@ -33834,14 +33846,14 @@
   use_change_exec=no
 
 fi;
-echo "$as_me:33837: result: $use_change_exec" >&5
+echo "$as_me:33849: 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:33844: checking if you want exec-links support" >&5
+echo "$as_me:33856: 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.
@@ -33858,14 +33870,14 @@
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:33861: result: $use_exec_links" >&5
+echo "$as_me:33873: 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:33868: checking if you want exec-scripts support" >&5
+echo "$as_me:33880: 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.
@@ -33882,14 +33894,14 @@
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:33885: result: $use_exec_scripts" >&5
+echo "$as_me:33897: 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:33892: checking if you want internal-links feature" >&5
+echo "$as_me:33904: 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.
@@ -33906,14 +33918,14 @@
   use_internal_links=no
 
 fi;
-echo "$as_me:33909: result: $use_internal_links" >&5
+echo "$as_me:33921: 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:33916: checking if you want to fork NSL requests" >&5
+echo "$as_me:33928: 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.
@@ -33930,7 +33942,7 @@
   use_nsl_fork=no
 
 fi;
-echo "$as_me:33933: result: $use_nsl_fork" >&5
+echo "$as_me:33945: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -33951,7 +33963,7 @@
 	esac
 fi
 
-echo "$as_me:33954: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:33966: 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.
@@ -33968,14 +33980,14 @@
   use_syslog=no
 
 fi;
-echo "$as_me:33971: result: $use_syslog" >&5
+echo "$as_me:33983: 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:33978: checking if you want to underline links" >&5
+echo "$as_me:33990: 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.
@@ -33992,7 +34004,7 @@
   use_underline=no
 
 fi;
-echo "$as_me:33995: result: $use_underline" >&5
+echo "$as_me:34007: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34004,7 +34016,7 @@
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34007: checking if help files should be gzip'ed" >&5
+echo "$as_me:34019: 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.
@@ -34021,10 +34033,10 @@
   use_gzip_help=no
 
 fi;
-echo "$as_me:34024: result: $use_gzip_help" >&5
+echo "$as_me:34036: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34027: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34039: 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.
@@ -34034,7 +34046,7 @@
 else
   use_bzlib=no
 fi;
-echo "$as_me:34037: result: $use_bzlib" >&5
+echo "$as_me:34049: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34073,7 +34085,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34076 "configure"
+#line 34088 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34085,16 +34097,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34088: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34091: \$? = $ac_status" >&5
+  echo "$as_me:34103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34097: \$? = $ac_status" >&5
+  echo "$as_me:34109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34111,7 +34123,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34114: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34126: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34152,7 +34164,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34155 "configure"
+#line 34167 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34164,16 +34176,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34170: \$? = $ac_status" >&5
+  echo "$as_me:34182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34176: \$? = $ac_status" >&5
+  echo "$as_me:34188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34190,7 +34202,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34193: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34205: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34206,7 +34218,7 @@
 fi
 
 	else
-{ { echo "$as_me:34209: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34221: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34231,7 +34243,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34234: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34246: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34260,7 +34272,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34263: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34275: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34269,7 +34281,7 @@
 fi
 
 	else
-{ { echo "$as_me:34272: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34284: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34283,12 +34295,12 @@
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:34286: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34298: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34291 "configure"
+#line 34303 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34305,16 +34317,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34311: \$? = $ac_status" >&5
+  echo "$as_me:34323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34317: \$? = $ac_status" >&5
+  echo "$as_me:34329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34328,7 +34340,7 @@
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34331 "configure"
+#line 34343 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34345,16 +34357,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34351: \$? = $ac_status" >&5
+  echo "$as_me:34363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34357: \$? = $ac_status" >&5
+  echo "$as_me:34369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34371,9 +34383,9 @@
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:34374: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:34386: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:34376: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34388: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34410,17 +34422,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/bzlib &&       cf_search="$cf_search /usr/include/bzlib"
-	test -d /usr/include/bzlib/include &&    cf_search="$cf_search /usr/include/bzlib/include"
-	test -d /usr/bzlib/include &&       cf_search="$cf_search /usr/bzlib/include"
-	test -d /usr/bzlib/include/bzlib &&    cf_search="$cf_search /usr/bzlib/include/bzlib"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -34432,39 +34433,28 @@
 	test -d $prefix/bzlib/include/bzlib &&    cf_search="$cf_search $prefix/bzlib/include/bzlib"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/bzlib &&       cf_search="$cf_search /usr/local/include/bzlib"
-	test -d /usr/local/include/bzlib/include &&    cf_search="$cf_search /usr/local/include/bzlib/include"
-	test -d /usr/local/bzlib/include &&       cf_search="$cf_search /usr/local/bzlib/include"
-	test -d /usr/local/bzlib/include/bzlib &&    cf_search="$cf_search /usr/local/bzlib/include/bzlib"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/bzlib &&       cf_search="$cf_search /opt/include/bzlib"
-	test -d /opt/include/bzlib/include &&    cf_search="$cf_search /opt/include/bzlib/include"
-	test -d /opt/bzlib/include &&       cf_search="$cf_search /opt/bzlib/include"
-	test -d /opt/bzlib/include/bzlib &&    cf_search="$cf_search /opt/bzlib/include/bzlib"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/bzlib &&       cf_search="$cf_search $HOME/include/bzlib"
-	test -d $HOME/include/bzlib/include &&    cf_search="$cf_search $HOME/include/bzlib/include"
-	test -d $HOME/bzlib/include &&       cf_search="$cf_search $HOME/bzlib/include"
-	test -d $HOME/bzlib/include/bzlib &&    cf_search="$cf_search $HOME/bzlib/include/bzlib"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/bzlib &&       cf_search="$cf_search $cf_subdir_prefix/include/bzlib"
+	test -d $cf_subdir_prefix/include/bzlib/include &&    cf_search="$cf_search $cf_subdir_prefix/include/bzlib/include"
+	test -d $cf_subdir_prefix/bzlib/include &&       cf_search="$cf_search $cf_subdir_prefix/bzlib/include"
+	test -d $cf_subdir_prefix/bzlib/include/bzlib &&    cf_search="$cf_search $cf_subdir_prefix/bzlib/include/bzlib"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -34486,11 +34476,11 @@
       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}:34489: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34479: 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 34493 "configure"
+#line 34483 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34507,21 +34497,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34513: \$? = $ac_status" >&5
+  echo "$as_me:34503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34519: \$? = $ac_status" >&5
+  echo "$as_me:34509: \$? = $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}:34524: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34514: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34539,7 +34529,7 @@
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:34542: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34532: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -34547,7 +34537,7 @@
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 34550 "configure"
+#line 34540 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34564,21 +34554,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34570: \$? = $ac_status" >&5
+  echo "$as_me:34560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34576: \$? = $ac_status" >&5
+  echo "$as_me:34566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:34581: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:34571: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -34619,17 +34609,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/bz2 &&       cf_search="$cf_search /usr/lib/bz2"
-	test -d /usr/lib/bz2/lib &&    cf_search="$cf_search /usr/lib/bz2/lib"
-	test -d /usr/bz2/lib &&       cf_search="$cf_search /usr/bz2/lib"
-	test -d /usr/bz2/lib/bz2 &&    cf_search="$cf_search /usr/bz2/lib/bz2"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -34641,39 +34620,28 @@
 	test -d $prefix/bz2/lib/bz2 &&    cf_search="$cf_search $prefix/bz2/lib/bz2"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/bz2 &&       cf_search="$cf_search /usr/local/lib/bz2"
-	test -d /usr/local/lib/bz2/lib &&    cf_search="$cf_search /usr/local/lib/bz2/lib"
-	test -d /usr/local/bz2/lib &&       cf_search="$cf_search /usr/local/bz2/lib"
-	test -d /usr/local/bz2/lib/bz2 &&    cf_search="$cf_search /usr/local/bz2/lib/bz2"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/bz2 &&       cf_search="$cf_search /opt/lib/bz2"
-	test -d /opt/lib/bz2/lib &&    cf_search="$cf_search /opt/lib/bz2/lib"
-	test -d /opt/bz2/lib &&       cf_search="$cf_search /opt/bz2/lib"
-	test -d /opt/bz2/lib/bz2 &&    cf_search="$cf_search /opt/bz2/lib/bz2"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/bz2 &&       cf_search="$cf_search $HOME/lib/bz2"
-	test -d $HOME/lib/bz2/lib &&    cf_search="$cf_search $HOME/lib/bz2/lib"
-	test -d $HOME/bz2/lib &&       cf_search="$cf_search $HOME/bz2/lib"
-	test -d $HOME/bz2/lib/bz2 &&    cf_search="$cf_search $HOME/bz2/lib/bz2"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/bz2 &&       cf_search="$cf_search $cf_subdir_prefix/lib/bz2"
+	test -d $cf_subdir_prefix/lib/bz2/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/bz2/lib"
+	test -d $cf_subdir_prefix/bz2/lib &&       cf_search="$cf_search $cf_subdir_prefix/bz2/lib"
+	test -d $cf_subdir_prefix/bz2/lib/bz2 &&    cf_search="$cf_search $cf_subdir_prefix/bz2/lib/bz2"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_bz2 in $cf_search
@@ -34681,13 +34649,13 @@
           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}:34684: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34652: 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 34690 "configure"
+#line 34658 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34704,21 +34672,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34710: \$? = $ac_status" >&5
+  echo "$as_me:34678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34716: \$? = $ac_status" >&5
+  echo "$as_me:34684: \$? = $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}:34721: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34689: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -34777,7 +34745,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34780 "configure"
+#line 34748 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34789,16 +34757,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34760: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34795: \$? = $ac_status" >&5
+  echo "$as_me:34763: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34801: \$? = $ac_status" >&5
+  echo "$as_me:34769: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34815,7 +34783,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34818: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34786: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34849,7 +34817,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34852: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34820: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34857,10 +34825,24 @@
   done
 fi
 
-	LIBS="-lbz2 $LIBS"
+cf_add_libs="-lbz2"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:34863: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:34845: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -34871,7 +34853,7 @@
 
 fi
 
-echo "$as_me:34874: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:34856: 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.
@@ -34881,7 +34863,7 @@
 else
   use_zlib=no
 fi;
-echo "$as_me:34884: result: $use_zlib" >&5
+echo "$as_me:34866: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -34920,7 +34902,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34923 "configure"
+#line 34905 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34932,16 +34914,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34938: \$? = $ac_status" >&5
+  echo "$as_me:34920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34944: \$? = $ac_status" >&5
+  echo "$as_me:34926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34958,7 +34940,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34961: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34943: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34999,7 +34981,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35002 "configure"
+#line 34984 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35011,16 +34993,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35017: \$? = $ac_status" >&5
+  echo "$as_me:34999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35023: \$? = $ac_status" >&5
+  echo "$as_me:35005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35037,7 +35019,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35040: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35022: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35053,7 +35035,7 @@
 fi
 
 	else
-{ { echo "$as_me:35056: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35038: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35078,7 +35060,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35081: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35063: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -35107,7 +35089,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35110: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35092: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -35116,7 +35098,7 @@
 fi
 
 	else
-{ { echo "$as_me:35119: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35101: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35130,12 +35112,12 @@
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35133: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35115: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35138 "configure"
+#line 35120 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35151,16 +35133,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35157: \$? = $ac_status" >&5
+  echo "$as_me:35139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35163: \$? = $ac_status" >&5
+  echo "$as_me:35145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35174,7 +35156,7 @@
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35177 "configure"
+#line 35159 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35190,16 +35172,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35193: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35196: \$? = $ac_status" >&5
+  echo "$as_me:35178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35202: \$? = $ac_status" >&5
+  echo "$as_me:35184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35216,9 +35198,9 @@
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:35219: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:35201: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:35221: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35203: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35255,17 +35237,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-	test -d /usr/include/zlib &&       cf_search="$cf_search /usr/include/zlib"
-	test -d /usr/include/zlib/include &&    cf_search="$cf_search /usr/include/zlib/include"
-	test -d /usr/zlib/include &&       cf_search="$cf_search /usr/zlib/include"
-	test -d /usr/zlib/include/zlib &&    cf_search="$cf_search /usr/zlib/include/zlib"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -35277,39 +35248,28 @@
 	test -d $prefix/zlib/include/zlib &&    cf_search="$cf_search $prefix/zlib/include/zlib"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/zlib &&       cf_search="$cf_search /usr/local/include/zlib"
-	test -d /usr/local/include/zlib/include &&    cf_search="$cf_search /usr/local/include/zlib/include"
-	test -d /usr/local/zlib/include &&       cf_search="$cf_search /usr/local/zlib/include"
-	test -d /usr/local/zlib/include/zlib &&    cf_search="$cf_search /usr/local/zlib/include/zlib"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-	test -d /opt/include/zlib &&       cf_search="$cf_search /opt/include/zlib"
-	test -d /opt/include/zlib/include &&    cf_search="$cf_search /opt/include/zlib/include"
-	test -d /opt/zlib/include &&       cf_search="$cf_search /opt/zlib/include"
-	test -d /opt/zlib/include/zlib &&    cf_search="$cf_search /opt/zlib/include/zlib"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-	test -d $HOME/include/zlib &&       cf_search="$cf_search $HOME/include/zlib"
-	test -d $HOME/include/zlib/include &&    cf_search="$cf_search $HOME/include/zlib/include"
-	test -d $HOME/zlib/include &&       cf_search="$cf_search $HOME/zlib/include"
-	test -d $HOME/zlib/include/zlib &&    cf_search="$cf_search $HOME/zlib/include/zlib"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
+	test -d $cf_subdir_prefix/include/zlib &&       cf_search="$cf_search $cf_subdir_prefix/include/zlib"
+	test -d $cf_subdir_prefix/include/zlib/include &&    cf_search="$cf_search $cf_subdir_prefix/include/zlib/include"
+	test -d $cf_subdir_prefix/zlib/include &&       cf_search="$cf_search $cf_subdir_prefix/zlib/include"
+	test -d $cf_subdir_prefix/zlib/include/zlib &&    cf_search="$cf_search $cf_subdir_prefix/zlib/include/zlib"
 }
 
+done
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -35331,11 +35291,11 @@
       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}:35334: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35294: 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 35338 "configure"
+#line 35298 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35351,21 +35311,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35357: \$? = $ac_status" >&5
+  echo "$as_me:35317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35363: \$? = $ac_status" >&5
+  echo "$as_me:35323: \$? = $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}:35368: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35328: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35383,7 +35343,7 @@
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:35386: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35346: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -35391,7 +35351,7 @@
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 35394 "configure"
+#line 35354 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35407,21 +35367,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35413: \$? = $ac_status" >&5
+  echo "$as_me:35373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35419: \$? = $ac_status" >&5
+  echo "$as_me:35379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:35424: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:35384: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -35462,17 +35422,6 @@
 
 cf_search=
 
-test "x/usr" != "x$prefix" && \
-test -d "/usr" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-	test -d /usr/lib/z &&       cf_search="$cf_search /usr/lib/z"
-	test -d /usr/lib/z/lib &&    cf_search="$cf_search /usr/lib/z/lib"
-	test -d /usr/z/lib &&       cf_search="$cf_search /usr/z/lib"
-	test -d /usr/z/lib/z &&    cf_search="$cf_search /usr/z/lib/z"
-}
-
 test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
@@ -35484,39 +35433,28 @@
 	test -d $prefix/z/lib/z &&    cf_search="$cf_search $prefix/z/lib/z"
 }
 
-test "x/usr/local" != "x$prefix" && \
-test -d "/usr/local" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-	test -d /usr/local/lib/z &&       cf_search="$cf_search /usr/local/lib/z"
-	test -d /usr/local/lib/z/lib &&    cf_search="$cf_search /usr/local/lib/z/lib"
-	test -d /usr/local/z/lib &&       cf_search="$cf_search /usr/local/z/lib"
-	test -d /usr/local/z/lib/z &&    cf_search="$cf_search /usr/local/z/lib/z"
-}
-
-test "x/opt" != "x$prefix" && \
-test -d "/opt" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-	test -d /opt/lib/z &&       cf_search="$cf_search /opt/lib/z"
-	test -d /opt/lib/z/lib &&    cf_search="$cf_search /opt/lib/z/lib"
-	test -d /opt/z/lib &&       cf_search="$cf_search /opt/z/lib"
-	test -d /opt/z/lib/z &&    cf_search="$cf_search /opt/z/lib/z"
-}
-
-test "x$HOME" != "x$prefix" && \
-test -d "$HOME" && \
-(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && {
-	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-	test -d $HOME/lib/z &&       cf_search="$cf_search $HOME/lib/z"
-	test -d $HOME/lib/z/lib &&    cf_search="$cf_search $HOME/lib/z/lib"
-	test -d $HOME/z/lib &&       cf_search="$cf_search $HOME/z/lib"
-	test -d $HOME/z/lib/z &&    cf_search="$cf_search $HOME/z/lib/z"
+for cf_subdir_prefix in \
+	/usr \
+	/usr/local \
+	/usr/pkg \
+	/opt \
+	/opt/local \
+	$HOME
+do
+
+test "x$cf_subdir_prefix" != "x$prefix" && \
+test -d "$cf_subdir_prefix" && \
+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_subdir_prefix"
+	test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+	test -d $cf_subdir_prefix/lib/z &&       cf_search="$cf_search $cf_subdir_prefix/lib/z"
+	test -d $cf_subdir_prefix/lib/z/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/z/lib"
+	test -d $cf_subdir_prefix/z/lib &&       cf_search="$cf_search $cf_subdir_prefix/z/lib"
+	test -d $cf_subdir_prefix/z/lib/z &&    cf_search="$cf_search $cf_subdir_prefix/z/lib/z"
 }
 
+done
+
 cf_search="$cf_library_path_list $cf_search"
 
         for cf_cv_library_path_z in $cf_search
@@ -35524,13 +35462,13 @@
           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}:35527: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35465: 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 35533 "configure"
+#line 35471 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35546,21 +35484,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35549: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35552: \$? = $ac_status" >&5
+  echo "$as_me:35490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35558: \$? = $ac_status" >&5
+  echo "$as_me:35496: \$? = $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}:35563: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35501: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -35619,7 +35557,7 @@
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35622 "configure"
+#line 35560 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35631,16 +35569,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35572: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35637: \$? = $ac_status" >&5
+  echo "$as_me:35575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35643: \$? = $ac_status" >&5
+  echo "$as_me:35581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35657,7 +35595,7 @@
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35660: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35598: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35691,7 +35629,7 @@
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35694: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35632: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -35699,10 +35637,24 @@
   done
 fi
 
-	LIBS="-lz $LIBS"
+cf_add_libs="-lz"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35705: WARNING: Cannot find z library" >&5
+{ echo "$as_me:35657: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -35711,13 +35663,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35714: checking for $ac_func" >&5
+echo "$as_me:35666: 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 35720 "configure"
+#line 35672 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -35748,16 +35700,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35754: \$? = $ac_status" >&5
+  echo "$as_me:35706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35760: \$? = $ac_status" >&5
+  echo "$as_me:35712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35767,7 +35719,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35770: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35722: 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
@@ -35784,7 +35736,7 @@
 
 fi
 
-echo "$as_me:35787: checking if you want to exclude FINGER code" >&5
+echo "$as_me:35739: 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.
@@ -35801,14 +35753,14 @@
   use_finger=no
 
 fi;
-echo "$as_me:35804: result: $use_finger" >&5
+echo "$as_me:35756: 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:35811: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:35763: 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.
@@ -35825,14 +35777,14 @@
   use_gopher=no
 
 fi;
-echo "$as_me:35828: result: $use_gopher" >&5
+echo "$as_me:35780: 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:35835: checking if you want to exclude NEWS code" >&5
+echo "$as_me:35787: 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.
@@ -35849,14 +35801,14 @@
   use_news=no
 
 fi;
-echo "$as_me:35852: result: $use_news" >&5
+echo "$as_me:35804: 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:35859: checking if you want to exclude FTP code" >&5
+echo "$as_me:35811: 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.
@@ -35873,14 +35825,14 @@
   use_ftp=no
 
 fi;
-echo "$as_me:35876: result: $use_ftp" >&5
+echo "$as_me:35828: 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:35883: checking if you want to include WAIS code" >&5
+echo "$as_me:35835: 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.
@@ -35897,13 +35849,13 @@
   use_wais=no
 
 fi;
-echo "$as_me:35900: result: $use_wais" >&5
+echo "$as_me:35852: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:35906: checking for fs_free in -lwais" >&5
+	echo "$as_me:35858: 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
@@ -35911,7 +35863,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 35914 "configure"
+#line 35866 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -35930,16 +35882,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35936: \$? = $ac_status" >&5
+  echo "$as_me:35888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35942: \$? = $ac_status" >&5
+  echo "$as_me:35894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -35950,18 +35902,18 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:35953: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:35905: 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:35957: checking if -lm needed for math functions" >&5
+echo "$as_me:35909: 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 35964 "configure"
+#line 35916 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -35976,16 +35928,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35982: \$? = $ac_status" >&5
+  echo "$as_me:35934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35988: \$? = $ac_status" >&5
+  echo "$as_me:35940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -35995,37 +35947,65 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35998: result: $cf_cv_need_libm" >&5
+echo "$as_me:35950: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
 
-	LIBS="-lm $LIBS"
+cf_add_libs="-lm"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 fi
 
-		LIBS="-lwais $LIBS"
+cf_add_libs="-lwais"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+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:36012: checking for $ac_header" >&5
+echo "$as_me:35992: 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 36018 "configure"
+#line 35998 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36022: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36002: \"$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:36028: \$? = $ac_status" >&5
+  echo "$as_me:36008: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36044,7 +36024,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36047: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36027: 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
@@ -36057,7 +36037,7 @@
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36060: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36040: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36065,7 +36045,7 @@
 
 # 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:36068: checking if directory-editor code should be used" >&5
+echo "$as_me:36048: 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.
@@ -36082,7 +36062,7 @@
   use_dired=yes
 
 fi;
-echo "$as_me:36085: result: $use_dired" >&5
+echo "$as_me:36065: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36092,7 +36072,7 @@
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36095: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36075: 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.
@@ -36109,10 +36089,10 @@
 else
   enableval=yes
 fi;
-	echo "$as_me:36112: result: $enableval" >&5
+	echo "$as_me:36092: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36115: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36095: 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.
@@ -36136,10 +36116,10 @@
 EOF
 
 fi;
-	echo "$as_me:36139: result: $enableval" >&5
+	echo "$as_me:36119: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36142: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36122: 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.
@@ -36163,10 +36143,10 @@
 EOF
 
 fi;
-	echo "$as_me:36166: result: $enableval" >&5
+	echo "$as_me:36146: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36169: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:36149: 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.
@@ -36183,10 +36163,10 @@
 else
   enableval=yes
 fi;
-	echo "$as_me:36186: result: $enableval" >&5
+	echo "$as_me:36166: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36189: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:36169: 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.
@@ -36210,10 +36190,10 @@
 EOF
 
 fi;
-	echo "$as_me:36213: result: $enableval" >&5
+	echo "$as_me:36193: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36216: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:36196: 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.
@@ -36237,10 +36217,10 @@
 EOF
 
 fi;
-	echo "$as_me:36240: result: $enableval" >&5
+	echo "$as_me:36220: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36243: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:36223: 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.
@@ -36264,10 +36244,10 @@
 EOF
 
 fi;
-	echo "$as_me:36267: result: $enableval" >&5
+	echo "$as_me:36247: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36270: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:36250: 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.
@@ -36291,11 +36271,11 @@
 EOF
 
 fi;
-	echo "$as_me:36294: result: $enableval" >&5
+	echo "$as_me:36274: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:36298: checking if you want long-directory listings" >&5
+echo "$as_me:36278: 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.
@@ -36319,10 +36299,10 @@
 EOF
 
 fi;
-echo "$as_me:36322: result: $enableval" >&5
+echo "$as_me:36302: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:36325: checking if parent-directory references are permitted" >&5
+echo "$as_me:36305: 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.
@@ -36339,7 +36319,7 @@
 else
   enableval=yes
 fi;
-echo "$as_me:36342: result: $enableval" >&5
+echo "$as_me:36322: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -36347,7 +36327,7 @@
 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:36350: checking for $ac_word" >&5
+echo "$as_me:36330: 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
@@ -36364,7 +36344,7 @@
   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:36367: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36347: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36375,10 +36355,10 @@
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:36378: result: $TELNET" >&5
+  echo "$as_me:36358: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:36381: result: no" >&5
+  echo "$as_me:36361: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36437,7 +36417,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36440: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36420: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -36455,7 +36435,7 @@
 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:36458: checking for $ac_word" >&5
+echo "$as_me:36438: 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
@@ -36472,7 +36452,7 @@
   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:36475: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36455: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36483,10 +36463,10 @@
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:36486: result: $TN3270" >&5
+  echo "$as_me:36466: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:36489: result: no" >&5
+  echo "$as_me:36469: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36545,7 +36525,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36548: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36528: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -36563,7 +36543,7 @@
 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:36566: checking for $ac_word" >&5
+echo "$as_me:36546: 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
@@ -36580,7 +36560,7 @@
   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:36583: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36563: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36591,10 +36571,10 @@
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:36594: result: $RLOGIN" >&5
+  echo "$as_me:36574: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:36597: result: no" >&5
+  echo "$as_me:36577: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36653,7 +36633,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36656: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36636: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -36671,7 +36651,7 @@
 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:36674: checking for $ac_word" >&5
+echo "$as_me:36654: 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
@@ -36688,7 +36668,7 @@
   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:36691: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36671: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36699,10 +36679,10 @@
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:36702: result: $MV" >&5
+  echo "$as_me:36682: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:36705: result: no" >&5
+  echo "$as_me:36685: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36761,7 +36741,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36764: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36744: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -36779,7 +36759,7 @@
 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:36782: checking for $ac_word" >&5
+echo "$as_me:36762: 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
@@ -36796,7 +36776,7 @@
   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:36799: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36779: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36807,10 +36787,10 @@
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:36810: result: $GZIP" >&5
+  echo "$as_me:36790: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:36813: result: no" >&5
+  echo "$as_me:36793: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36869,7 +36849,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36872: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36852: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -36887,7 +36867,7 @@
 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:36890: checking for $ac_word" >&5
+echo "$as_me:36870: 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
@@ -36904,7 +36884,7 @@
   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:36907: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36887: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36915,10 +36895,10 @@
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:36918: result: $UNCOMPRESS" >&5
+  echo "$as_me:36898: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:36921: result: no" >&5
+  echo "$as_me:36901: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36977,7 +36957,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36980: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36960: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -36995,7 +36975,7 @@
 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:36998: checking for $ac_word" >&5
+echo "$as_me:36978: 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
@@ -37012,7 +36992,7 @@
   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:37015: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36995: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37023,10 +37003,10 @@
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:37026: result: $UNZIP" >&5
+  echo "$as_me:37006: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37029: result: no" >&5
+  echo "$as_me:37009: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37085,7 +37065,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37088: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37068: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37103,7 +37083,7 @@
 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:37106: checking for $ac_word" >&5
+echo "$as_me:37086: 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
@@ -37120,7 +37100,7 @@
   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:37123: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37103: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37131,10 +37111,10 @@
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37134: result: $BZIP2" >&5
+  echo "$as_me:37114: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37137: result: no" >&5
+  echo "$as_me:37117: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37193,7 +37173,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37196: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37176: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -37211,7 +37191,7 @@
 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:37214: checking for $ac_word" >&5
+echo "$as_me:37194: 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
@@ -37228,7 +37208,7 @@
   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:37231: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37211: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37239,10 +37219,10 @@
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:37242: result: $TAR" >&5
+  echo "$as_me:37222: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:37245: result: no" >&5
+  echo "$as_me:37225: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37301,7 +37281,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37304: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37284: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -37359,7 +37339,7 @@
 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:37362: checking for $ac_word" >&5
+echo "$as_me:37342: 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
@@ -37376,7 +37356,7 @@
   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:37379: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37359: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37387,10 +37367,10 @@
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:37390: result: $COMPRESS" >&5
+  echo "$as_me:37370: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:37393: result: no" >&5
+  echo "$as_me:37373: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37449,7 +37429,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37452: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37432: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -37467,7 +37447,7 @@
 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:37470: checking for $ac_word" >&5
+echo "$as_me:37450: 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
@@ -37484,7 +37464,7 @@
   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:37487: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37467: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37495,10 +37475,10 @@
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:37498: result: $RM" >&5
+  echo "$as_me:37478: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:37501: result: no" >&5
+  echo "$as_me:37481: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37557,7 +37537,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37560: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37540: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -37575,7 +37555,7 @@
 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:37578: checking for $ac_word" >&5
+echo "$as_me:37558: 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
@@ -37592,7 +37572,7 @@
   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:37595: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37575: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37603,10 +37583,10 @@
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:37606: result: $UUDECODE" >&5
+  echo "$as_me:37586: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:37609: result: no" >&5
+  echo "$as_me:37589: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37665,7 +37645,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37668: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37648: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -37683,7 +37663,7 @@
 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:37686: checking for $ac_word" >&5
+echo "$as_me:37666: 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
@@ -37700,7 +37680,7 @@
   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:37703: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37683: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37711,10 +37691,10 @@
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:37714: result: $ZCAT" >&5
+  echo "$as_me:37694: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:37717: result: no" >&5
+  echo "$as_me:37697: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37773,7 +37753,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37776: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37756: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -37791,7 +37771,7 @@
 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:37794: checking for $ac_word" >&5
+echo "$as_me:37774: 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
@@ -37808,7 +37788,7 @@
   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:37811: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37791: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37819,10 +37799,10 @@
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:37822: result: $ZIP" >&5
+  echo "$as_me:37802: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:37825: result: no" >&5
+  echo "$as_me:37805: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37881,7 +37861,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37884: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37864: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -37909,7 +37889,7 @@
 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:37912: checking for $ac_word" >&5
+echo "$as_me:37892: 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
@@ -37926,7 +37906,7 @@
   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:37929: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37909: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37937,10 +37917,10 @@
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:37940: result: $INSTALL" >&5
+  echo "$as_me:37920: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:37943: result: no" >&5
+  echo "$as_me:37923: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37999,7 +37979,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38002: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37982: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38029,7 +38009,7 @@
 	case $host_os in #(vi
 	mingw*)
 
-echo "$as_me:38032: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38012: 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
@@ -38037,7 +38017,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38040 "configure"
+#line 38020 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38056,16 +38036,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38062: \$? = $ac_status" >&5
+  echo "$as_me:38042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38068: \$? = $ac_status" >&5
+  echo "$as_me:38048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38076,20 +38056,35 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38079: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38059: 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
 
-	LIBS="-lpdcurses $LIBS"
+cf_add_libs="-lpdcurses"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38086: checking for winwstr" >&5
+	echo "$as_me:38081: 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 38092 "configure"
+#line 38087 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38120,16 +38115,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38126: \$? = $ac_status" >&5
+  echo "$as_me:38121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38132: \$? = $ac_status" >&5
+  echo "$as_me:38127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38139,7 +38134,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38142: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38137: 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
@@ -38148,13 +38143,13 @@
 
 fi
 
-	echo "$as_me:38151: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:38146: 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 38157 "configure"
+#line 38152 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -38185,16 +38180,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38191: \$? = $ac_status" >&5
+  echo "$as_me:38186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38197: \$? = $ac_status" >&5
+  echo "$as_me:38192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -38204,7 +38199,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38207: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:38202: 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
@@ -38217,7 +38212,7 @@
 
 		;;
 	*) #(vi
-		echo "$as_me:38220: checking for X" >&5
+		echo "$as_me:38215: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -38314,17 +38309,17 @@
   # 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 38317 "configure"
+#line 38312 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:38321: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38316: \"$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:38327: \$? = $ac_status" >&5
+  echo "$as_me:38322: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38357,7 +38352,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 38360 "configure"
+#line 38355 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -38369,16 +38364,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38375: \$? = $ac_status" >&5
+  echo "$as_me:38370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38381: \$? = $ac_status" >&5
+  echo "$as_me:38376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -38416,7 +38411,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:38419: result: $have_x" >&5
+  echo "$as_me:38414: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -38426,7 +38421,7 @@
   # 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:38429: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:38424: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -38450,11 +38445,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:38453: checking whether -R must be followed by a space" >&5
+      echo "$as_me:38448: 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 38457 "configure"
+#line 38452 "configure"
 #include "confdefs.h"
 
 int
@@ -38466,16 +38461,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38472: \$? = $ac_status" >&5
+  echo "$as_me:38467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38478: \$? = $ac_status" >&5
+  echo "$as_me:38473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -38485,13 +38480,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:38488: result: no" >&5
+	echo "$as_me:38483: 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 38494 "configure"
+#line 38489 "configure"
 #include "confdefs.h"
 
 int
@@ -38503,16 +38498,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38509: \$? = $ac_status" >&5
+  echo "$as_me:38504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38515: \$? = $ac_status" >&5
+  echo "$as_me:38510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -38522,11 +38517,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:38525: result: yes" >&5
+	  echo "$as_me:38520: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:38529: result: neither works" >&5
+	  echo "$as_me:38524: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -38546,7 +38541,7 @@
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 38549 "configure"
+#line 38544 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38565,22 +38560,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38563: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38571: \$? = $ac_status" >&5
+  echo "$as_me:38566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38577: \$? = $ac_status" >&5
+  echo "$as_me:38572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:38583: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:38578: 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
@@ -38588,7 +38583,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38591 "configure"
+#line 38586 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38607,16 +38602,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38613: \$? = $ac_status" >&5
+  echo "$as_me:38608: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38619: \$? = $ac_status" >&5
+  echo "$as_me:38614: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -38627,14 +38622,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38630: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:38625: 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:38637: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:38632: 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
@@ -38642,7 +38637,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38645 "configure"
+#line 38640 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38661,16 +38656,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38667: \$? = $ac_status" >&5
+  echo "$as_me:38662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38673: \$? = $ac_status" >&5
+  echo "$as_me:38668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -38681,7 +38676,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38684: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:38679: 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"
@@ -38700,13 +38695,13 @@
     # 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:38703: checking for gethostbyname" >&5
+    echo "$as_me:38698: 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 38709 "configure"
+#line 38704 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -38737,16 +38732,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38743: \$? = $ac_status" >&5
+  echo "$as_me:38738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38749: \$? = $ac_status" >&5
+  echo "$as_me:38744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -38756,11 +38751,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38759: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:38754: 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:38763: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:38758: 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
@@ -38768,7 +38763,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38771 "configure"
+#line 38766 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38787,16 +38782,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38793: \$? = $ac_status" >&5
+  echo "$as_me:38788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38799: \$? = $ac_status" >&5
+  echo "$as_me:38794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -38807,14 +38802,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38810: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:38805: 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:38817: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:38812: 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
@@ -38822,7 +38817,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38825 "configure"
+#line 38820 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38841,16 +38836,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38847: \$? = $ac_status" >&5
+  echo "$as_me:38842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38853: \$? = $ac_status" >&5
+  echo "$as_me:38848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -38861,7 +38856,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38864: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:38859: 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"
@@ -38877,13 +38872,13 @@
     # 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:38880: checking for connect" >&5
+    echo "$as_me:38875: 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 38886 "configure"
+#line 38881 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -38914,16 +38909,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38920: \$? = $ac_status" >&5
+  echo "$as_me:38915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38926: \$? = $ac_status" >&5
+  echo "$as_me:38921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -38933,11 +38928,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38936: result: $ac_cv_func_connect" >&5
+echo "$as_me:38931: 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:38940: checking for connect in -lsocket" >&5
+      echo "$as_me:38935: 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
@@ -38945,7 +38940,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38948 "configure"
+#line 38943 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38964,16 +38959,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38970: \$? = $ac_status" >&5
+  echo "$as_me:38965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38976: \$? = $ac_status" >&5
+  echo "$as_me:38971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -38984,7 +38979,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38987: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:38982: 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"
@@ -38993,13 +38988,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:38996: checking for remove" >&5
+    echo "$as_me:38991: 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 39002 "configure"
+#line 38997 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39030,16 +39025,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39036: \$? = $ac_status" >&5
+  echo "$as_me:39031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39042: \$? = $ac_status" >&5
+  echo "$as_me:39037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39049,11 +39044,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39052: result: $ac_cv_func_remove" >&5
+echo "$as_me:39047: 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:39056: checking for remove in -lposix" >&5
+      echo "$as_me:39051: 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
@@ -39061,7 +39056,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39064 "configure"
+#line 39059 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39080,16 +39075,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39086: \$? = $ac_status" >&5
+  echo "$as_me:39081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39092: \$? = $ac_status" >&5
+  echo "$as_me:39087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39100,7 +39095,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39103: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39098: 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"
@@ -39109,13 +39104,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39112: checking for shmat" >&5
+    echo "$as_me:39107: 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 39118 "configure"
+#line 39113 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39146,16 +39141,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39152: \$? = $ac_status" >&5
+  echo "$as_me:39147: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39158: \$? = $ac_status" >&5
+  echo "$as_me:39153: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -39165,11 +39160,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39168: result: $ac_cv_func_shmat" >&5
+echo "$as_me:39163: 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:39172: checking for shmat in -lipc" >&5
+      echo "$as_me:39167: 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
@@ -39177,7 +39172,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39180 "configure"
+#line 39175 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39196,16 +39191,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39202: \$? = $ac_status" >&5
+  echo "$as_me:39197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39208: \$? = $ac_status" >&5
+  echo "$as_me:39203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -39216,7 +39211,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39219: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:39214: 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"
@@ -39234,7 +39229,7 @@
   # 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:39237: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:39232: 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
@@ -39242,7 +39237,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39245 "configure"
+#line 39240 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39261,16 +39256,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39267: \$? = $ac_status" >&5
+  echo "$as_me:39262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39273: \$? = $ac_status" >&5
+  echo "$as_me:39268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -39281,7 +39276,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39284: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:39279: 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"
@@ -39293,7 +39288,7 @@
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:39296: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:39291: 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=
 
@@ -39304,14 +39299,32 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:39307: result: yes" >&5
+	echo "$as_me:39302: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+	echo "$as_me:39305: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+echo "$as_me:39309: 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=
+
+# Check whether --with-Xaw3dxft or --without-Xaw3dxft was given.
+if test "${with_Xaw3dxft+set}" = set; then
+  withval="$with_Xaw3dxft"
+
+fi;
+if test "$withval" = yes ; then
+	cf_x_athena=Xaw3dxft
+	echo "$as_me:39320: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39310: result: no" >&5
+	echo "$as_me:39323: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39314: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:39327: 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=
 
@@ -39322,14 +39335,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:39325: result: yes" >&5
+	echo "$as_me:39338: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39328: result: no" >&5
+	echo "$as_me:39341: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39332: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:39345: 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=
 
@@ -39340,10 +39353,10 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:39343: result: yes" >&5
+	echo "$as_me:39356: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39346: result: no" >&5
+	echo "$as_me:39359: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39363,17 +39376,17 @@
 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}:39366: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:39379: 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}:39372: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39385: 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}:39376: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39389: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39390,7 +39403,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -39431,7 +39444,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -39453,7 +39466,21 @@
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-	LIBS="$cf_pkgconfig_libs $LIBS"
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 			cf_x_athena_lib="$cf_pkgconfig_libs"
 
@@ -39470,20 +39497,20 @@
 			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}:39473: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39500: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:39479: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:39506: 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 39486 "configure"
+#line 39513 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -39499,16 +39526,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39505: \$? = $ac_status" >&5
+  echo "$as_me:39532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39511: \$? = $ac_status" >&5
+  echo "$as_me:39538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -39518,7 +39545,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39521: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:39548: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -39530,7 +39557,7 @@
 				*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:39533: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:39560: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -39538,17 +39565,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:39541: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:39568: 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}:39547: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39574: 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}:39551: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39578: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39565,7 +39592,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -39606,7 +39633,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -39628,18 +39655,32 @@
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-	LIBS="$cf_pkgconfig_libs $LIBS"
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 							LIBS="$cf_save_xmu"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39637: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39678: 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}:39642: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39683: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -39647,12 +39688,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39650: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39691: 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}:39655: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39696: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -39663,7 +39704,7 @@
 			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}:39666: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39707: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -39688,17 +39729,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:39691: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:39732: 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}:39697: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39738: 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}:39701: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39742: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39715,7 +39756,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -39756,7 +39797,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -39778,13 +39819,28 @@
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-	LIBS="$cf_pkgconfig_libs $LIBS"
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 	:
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:39787: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:39843: 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
@@ -39792,7 +39848,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39795 "configure"
+#line 39851 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39811,16 +39867,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39817: \$? = $ac_status" >&5
+  echo "$as_me:39873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39823: \$? = $ac_status" >&5
+  echo "$as_me:39879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -39831,10 +39887,505 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39834: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:39890: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
-  LIBS="-lXext $LIBS"
+
+cf_add_libs="-lXext"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+fi
+
+fi
+
+# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and
+# in some cases has installed dummy files in the former, other cases replaced
+# it with a link to the new location).  This complicates the configure script.
+# Check for that pitfall, and recover using pkg-config
+#
+# If none of these are set, the configuration is almost certainly broken.
+if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}"
+then
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+	test -n "$verbose" && echo "	found package x11" 1>&6
+
+echo "${as_me:-configure}:39926: 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}:39932: 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}:39936: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				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"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+	:
+else
+	cf_pkgconfig_incs=
+	cf_pkgconfig_libs=
+	{ echo "$as_me:40036: 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}:40043: 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}:40049: 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}:40053: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				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"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+	:
+else
+	cf_pkgconfig_incs=
+	cf_pkgconfig_libs=
+	{ echo "$as_me:40153: 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}:40160: 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}:40166: 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}:40170: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				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"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+	:
+else
+	cf_pkgconfig_incs=
+	cf_pkgconfig_libs=
+	{ echo "$as_me:40270: 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}:40277: 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}:40283: 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}:40287: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				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"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+	:
+else
+	cf_pkgconfig_incs=
+	cf_pkgconfig_libs=
+	{ echo "$as_me:40387: WARNING: unable to find Xt library" >&5
+echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
 fi
@@ -39844,17 +40395,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:39847: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40398: 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}:39853: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40404: 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}:39857: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40408: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39871,7 +40422,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -39912,7 +40463,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -39934,21 +40485,35 @@
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-	LIBS="$cf_pkgconfig_libs $LIBS"
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 	case "x$LIBS" in #(vi
 	*-lX11*) #(vi
 		;;
 	*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:39944: checking for usable X dependency" >&5
+echo "$as_me:40509: 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 39951 "configure"
+#line 40516 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -39967,16 +40532,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39970: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39973: \$? = $ac_status" >&5
+  echo "$as_me:40538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39979: \$? = $ac_status" >&5
+  echo "$as_me:40544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -39986,30 +40551,30 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39989: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:40554: 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}:39995: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:40560: 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}:40002: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40567: 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}:40008: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40573: 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}:40012: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40577: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40026,7 +40591,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -40067,7 +40632,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -40089,7 +40654,22 @@
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-	LIBS="$cf_pkgconfig_libs $LIBS"
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 	:
 else
 	cf_pkgconfig_incs=
@@ -40097,12 +40677,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40100: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40680: 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}:40105: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40685: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40110,14 +40690,14 @@
 		;;
 	esac
 
-echo "$as_me:40113: checking for usable X Toolkit package" >&5
+echo "$as_me:40693: 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 40120 "configure"
+#line 40700 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -40132,16 +40712,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40138: \$? = $ac_status" >&5
+  echo "$as_me:40718: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40144: \$? = $ac_status" >&5
+  echo "$as_me:40724: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -40151,7 +40731,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40154: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:40734: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -40165,22 +40745,22 @@
 			*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:40168: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:40748: 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}:40173: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40753: 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}:40179: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40759: 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}:40183: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40763: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40197,7 +40777,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -40238,7 +40818,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -40260,22 +40840,36 @@
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-	LIBS="$cf_pkgconfig_libs $LIBS"
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+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}:40268: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:40862: 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}:40274: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40868: 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}:40278: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40872: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40292,7 +40886,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -40333,7 +40927,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -40355,7 +40949,22 @@
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-	LIBS="$cf_pkgconfig_libs $LIBS"
+cf_add_libs="$cf_pkgconfig_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 	:
 else
 	cf_pkgconfig_incs=
@@ -40369,12 +40978,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40372: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40981: 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}:40377: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40986: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40394,7 +41003,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:40397: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41006: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -40414,7 +41023,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -40455,7 +41064,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -40465,7 +41074,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:40468: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41077: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -40473,7 +41082,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:40476: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41085: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -40481,14 +41090,14 @@
 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}:40484: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41093: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-if test "$cf_check_cflags" != "$CFLAGS" ; then
+if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 40491 "configure"
+#line 41100 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40500,16 +41109,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40506: \$? = $ac_status" >&5
+  echo "$as_me:41115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40512: \$? = $ac_status" >&5
+  echo "$as_me:41121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -40517,12 +41126,12 @@
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:40520: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41129: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
-	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:40525: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41134: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -40530,13 +41139,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:40533: checking for XOpenDisplay" >&5
+	echo "$as_me:41142: 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 40539 "configure"
+#line 41148 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -40567,16 +41176,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40573: \$? = $ac_status" >&5
+  echo "$as_me:41182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40579: \$? = $ac_status" >&5
+  echo "$as_me:41188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -40586,13 +41195,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40589: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:41198: 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:40595: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:41204: 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
@@ -40600,7 +41209,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40603 "configure"
+#line 41212 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40619,16 +41228,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40625: \$? = $ac_status" >&5
+  echo "$as_me:41234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40631: \$? = $ac_status" >&5
+  echo "$as_me:41240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -40639,21 +41248,37 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40642: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41251: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
-  LIBS="-lX11 $LIBS"
+
+cf_add_libs="-lX11"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 fi
 
 fi
 
-	echo "$as_me:40650: checking for XtAppInitialize" >&5
+	echo "$as_me:41275: 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 40656 "configure"
+#line 41281 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -40684,16 +41309,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40690: \$? = $ac_status" >&5
+  echo "$as_me:41315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40696: \$? = $ac_status" >&5
+  echo "$as_me:41321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -40703,13 +41328,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40706: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:41331: 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:40712: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:41337: 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
@@ -40717,7 +41342,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40720 "configure"
+#line 41345 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40736,16 +41361,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40742: \$? = $ac_status" >&5
+  echo "$as_me:41367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40748: \$? = $ac_status" >&5
+  echo "$as_me:41373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -40756,7 +41381,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40759: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:41384: 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
 
@@ -40773,7 +41398,7 @@
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:40776: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:41401: 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
@@ -40795,14 +41420,14 @@
 		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:40798: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:41423: 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:40801: checking for $cf_test" >&5
+			echo "$as_me:41426: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 40805 "configure"
+#line 41430 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -40816,16 +41441,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40822: \$? = $ac_status" >&5
+  echo "$as_me:41447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40828: \$? = $ac_status" >&5
+  echo "$as_me:41453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -40834,7 +41459,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:40837: result: $cf_result" >&5
+		echo "$as_me:41462: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -40846,7 +41471,7 @@
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:40849: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:41474: 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"
@@ -40875,16 +41500,48 @@
 			cf_save="$LIBS"
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
-				LIBS="-L$cf_path/lib $cf_libs $LIBS"
-				echo "$as_me:40879: checking for $cf_libs in $cf_path" >&5
+
+cf_add_libs="-L$cf_path/lib $cf_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+				echo "$as_me:41520: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
-				LIBS="$cf_libs $LIBS"
-				echo "$as_me:40883: checking for $cf_test in $cf_libs" >&5
+
+cf_add_libs="$cf_libs"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
+				echo "$as_me:41540: 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 40887 "configure"
+#line 41544 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -40900,16 +41557,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40906: \$? = $ac_status" >&5
+  echo "$as_me:41563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40912: \$? = $ac_status" >&5
+  echo "$as_me:41569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -40918,7 +41575,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:40921: result: $cf_result" >&5
+			echo "$as_me:41578: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -40932,7 +41589,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:40935: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:41592: 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
@@ -40950,7 +41607,7 @@
   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:40953: checking for $ac_word" >&5
+echo "$as_me:41610: 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
@@ -40965,7 +41622,7 @@
   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:40968: found $ac_dir/$ac_word" >&5
+echo "$as_me:41625: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -40973,10 +41630,10 @@
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:40976: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:41633: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:40979: result: no" >&5
+  echo "$as_me:41636: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40989,7 +41646,7 @@
 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:40992: checking for $ac_word" >&5
+echo "$as_me:41649: 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
@@ -41004,7 +41661,7 @@
   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:41007: found $ac_dir/$ac_word" >&5
+echo "$as_me:41664: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -41012,10 +41669,10 @@
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:41015: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:41672: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:41018: result: no" >&5
+  echo "$as_me:41675: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -41029,7 +41686,22 @@
 if test "$XCURSES_CONFIG" != none ; then
 
 CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`"
-LIBS="`$XCURSES_CONFIG --libs` $LIBS"
+
+cf_add_libs="`$XCURSES_CONFIG --libs`"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
 
 cf_cv_lib_XCurses=yes
 
@@ -41039,7 +41711,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41042: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41714: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -41059,7 +41731,7 @@
 		-D*)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 				&& test -z "${cf_tst_cflags}" \
 				&& cf_fix_cppflags=yes
 
@@ -41100,7 +41772,7 @@
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
 		&& test -z "${cf_tst_cflags}" \
 		&& cf_fix_cppflags=no
 	;;
@@ -41110,7 +41782,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:41113: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41785: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -41118,7 +41790,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:41121: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41793: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -41126,14 +41798,14 @@
 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}:41129: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41801: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
-if test "$cf_check_cflags" != "$CFLAGS" ; then
+if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 41136 "configure"
+#line 41808 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41145,16 +41817,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41151: \$? = $ac_status" >&5
+  echo "$as_me:41823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41157: \$? = $ac_status" >&5
+  echo "$as_me:41829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -41162,12 +41834,12 @@
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41165: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41837: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
-	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:41170: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41842: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -41175,7 +41847,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:41178: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:41850: 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
@@ -41183,7 +41855,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41186 "configure"
+#line 41858 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41202,16 +41874,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41208: \$? = $ac_status" >&5
+  echo "$as_me:41880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41214: \$? = $ac_status" >&5
+  echo "$as_me:41886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -41222,21 +41894,52 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41225: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41897: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
-  LIBS="-lX11 $LIBS"
+
+cf_add_libs="-lX11"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 fi
 
-echo "$as_me:41231: checking for XCurses library" >&5
+echo "$as_me:41919: 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
 else
 
-LIBS="-lXCurses $LIBS"
+cf_add_libs="-lXCurses"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 cat >conftest.$ac_ext <<_ACEOF
-#line 41239 "configure"
+#line 41942 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -41251,16 +41954,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41257: \$? = $ac_status" >&5
+  echo "$as_me:41960: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41263: \$? = $ac_status" >&5
+  echo "$as_me:41966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -41271,7 +41974,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:41274: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:41977: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -41286,23 +41989,23 @@
 #define XCURSES 1
 EOF
 
-	echo "$as_me:41289: checking for xcurses.h" >&5
+	echo "$as_me:41992: 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 41295 "configure"
+#line 41998 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:41299: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42002: \"$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:41305: \$? = $ac_status" >&5
+  echo "$as_me:42008: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -41321,7 +42024,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:41324: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:42027: 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
 
@@ -41332,7 +42035,7 @@
 fi
 
 else
-	{ { echo "$as_me:41335: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:42038: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -41341,7 +42044,7 @@
 	esac
 else
 
-echo "$as_me:41344: checking if we can include termio.h with curses" >&5
+echo "$as_me:42047: 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
@@ -41351,7 +42054,7 @@
     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 41354 "configure"
+#line 42057 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -41365,16 +42068,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41371: \$? = $ac_status" >&5
+  echo "$as_me:42074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41377: \$? = $ac_status" >&5
+  echo "$as_me:42080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -41387,7 +42090,7 @@
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:41390: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:42093: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -41404,23 +42107,23 @@
 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:41407: checking for $ac_header" >&5
+echo "$as_me:42110: 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 41413 "configure"
+#line 42116 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:41417: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42120: \"$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:41423: \$? = $ac_status" >&5
+  echo "$as_me:42126: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -41439,7 +42142,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:41442: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42145: 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
@@ -41451,7 +42154,7 @@
 
 	fi
 
-echo "$as_me:41454: checking if curses supports alternate-character set" >&5
+echo "$as_me:42157: 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
@@ -41460,7 +42163,7 @@
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 41463 "configure"
+#line 42166 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41474,16 +42177,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41480: \$? = $ac_status" >&5
+  echo "$as_me:42183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41486: \$? = $ac_status" >&5
+  echo "$as_me:42189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -41497,21 +42200,21 @@
 
 fi
 
-echo "$as_me:41500: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:42203: 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:41507: checking if curses supports fancy attributes" >&5
+echo "$as_me:42210: 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 41514 "configure"
+#line 42217 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41529,16 +42232,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41535: \$? = $ac_status" >&5
+  echo "$as_me:42238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41541: \$? = $ac_status" >&5
+  echo "$as_me:42244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -41550,14 +42253,14 @@
 
 fi
 
-echo "$as_me:41553: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:42256: 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:41560: checking for function curses_version" >&5
+echo "$as_me:42263: 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
@@ -41567,7 +42270,7 @@
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 41570 "configure"
+#line 42273 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41580,15 +42283,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:41583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41586: \$? = $ac_status" >&5
+  echo "$as_me:42289: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:41588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41591: \$? = $ac_status" >&5
+  echo "$as_me:42294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -41603,7 +42306,7 @@
 fi
 rm -f core
 fi
-echo "$as_me:41606: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:42309: 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
@@ -41611,14 +42314,14 @@
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:41614: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:42317: 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 41621 "configure"
+#line 42324 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41637,16 +42340,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41643: \$? = $ac_status" >&5
+  echo "$as_me:42346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41649: \$? = $ac_status" >&5
+  echo "$as_me:42352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -41658,10 +42361,10 @@
 
 fi
 
-echo "$as_me:41661: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:42364: 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:41664: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:42367: 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
@@ -41671,14 +42374,14 @@
 fi
 fi
 
-echo "$as_me:41674: checking if curses supports color attributes" >&5
+echo "$as_me:42377: 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 41681 "configure"
+#line 42384 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41698,16 +42401,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42404: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41704: \$? = $ac_status" >&5
+  echo "$as_me:42407: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41710: \$? = $ac_status" >&5
+  echo "$as_me:42413: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -41719,7 +42422,7 @@
 
 fi
 
-echo "$as_me:41722: result: $cf_cv_color_curses" >&5
+echo "$as_me:42425: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -41741,23 +42444,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:41744: checking for $ac_header" >&5
+echo "$as_me:42447: 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 41750 "configure"
+#line 42453 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:41754: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42457: \"$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:41760: \$? = $ac_status" >&5
+  echo "$as_me:42463: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -41776,7 +42479,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:41779: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42482: 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
@@ -41791,23 +42494,23 @@
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:41794: checking for $ac_header" >&5
+echo "$as_me:42497: 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 41800 "configure"
+#line 42503 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:41804: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42507: \"$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:41810: \$? = $ac_status" >&5
+  echo "$as_me:42513: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -41826,7 +42529,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:41829: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42532: 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
@@ -41844,10 +42547,10 @@
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:41847: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:42550: 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 41850 "configure"
+#line 42553 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -41859,16 +42562,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42565: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41865: \$? = $ac_status" >&5
+  echo "$as_me:42568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41871: \$? = $ac_status" >&5
+  echo "$as_me:42574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -41876,7 +42579,7 @@
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 41879 "configure"
+#line 42582 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -41890,16 +42593,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42596: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41896: \$? = $ac_status" >&5
+  echo "$as_me:42599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41902: \$? = $ac_status" >&5
+  echo "$as_me:42605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -41915,12 +42618,12 @@
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:41918: result: $termios_bad" >&5
+	echo "$as_me:42621: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:41923: checking declaration of size-change" >&5
+echo "$as_me:42626: 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
@@ -41935,7 +42638,7 @@
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 41938 "configure"
+#line 42641 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -41979,16 +42682,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41982: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41985: \$? = $ac_status" >&5
+  echo "$as_me:42688: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41991: \$? = $ac_status" >&5
+  echo "$as_me:42694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -42007,7 +42710,7 @@
 done
 
 fi
-echo "$as_me:42010: result: $cf_cv_sizechange" >&5
+echo "$as_me:42713: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -42025,14 +42728,14 @@
 	esac
 fi
 
-echo "$as_me:42028: checking if ttytype is declared in curses library" >&5
+echo "$as_me:42731: 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 42035 "configure"
+#line 42738 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -42044,16 +42747,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42050: \$? = $ac_status" >&5
+  echo "$as_me:42753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42056: \$? = $ac_status" >&5
+  echo "$as_me:42759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -42065,7 +42768,7 @@
 
 fi
 
-echo "$as_me:42068: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:42771: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -42074,14 +42777,14 @@
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:42077: checking if curses supports wide characters" >&5
+echo "$as_me:42780: 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 42084 "configure"
+#line 42787 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42100,16 +42803,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42106: \$? = $ac_status" >&5
+  echo "$as_me:42809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42112: \$? = $ac_status" >&5
+  echo "$as_me:42815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -42120,7 +42823,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:42123: result: $cf_cv_widec_curses" >&5
+echo "$as_me:42826: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -42130,14 +42833,14 @@
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:42133: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:42836: 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 42140 "configure"
+#line 42843 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42151,23 +42854,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42157: \$? = $ac_status" >&5
+  echo "$as_me:42860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42163: \$? = $ac_status" >&5
+  echo "$as_me:42866: \$? = $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 42170 "configure"
+#line 42873 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42182,16 +42885,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42188: \$? = $ac_status" >&5
+  echo "$as_me:42891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42194: \$? = $ac_status" >&5
+  echo "$as_me:42897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -42203,7 +42906,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:42206: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:42909: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -42226,14 +42929,14 @@
 
 	fi
 
-echo "$as_me:42229: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:42932: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 42236 "configure"
+#line 42939 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -42255,23 +42958,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42261: \$? = $ac_status" >&5
+  echo "$as_me:42964: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42267: \$? = $ac_status" >&5
+  echo "$as_me:42970: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 42274 "configure"
+#line 42977 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -42293,16 +42996,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42299: \$? = $ac_status" >&5
+  echo "$as_me:43002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42305: \$? = $ac_status" >&5
+  echo "$as_me:43008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -42314,11 +43017,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42317: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:43020: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:42321: checking for term.h" >&5
+echo "$as_me:43024: 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
@@ -42339,7 +43042,7 @@
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42342 "configure"
+#line 43045 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42353,16 +43056,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42359: \$? = $ac_status" >&5
+  echo "$as_me:43062: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42365: \$? = $ac_status" >&5
+  echo "$as_me:43068: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -42381,7 +43084,7 @@
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42384 "configure"
+#line 43087 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42399,16 +43102,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42405: \$? = $ac_status" >&5
+  echo "$as_me:43108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42411: \$? = $ac_status" >&5
+  echo "$as_me:43114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -42423,7 +43126,7 @@
 esac
 
 fi
-echo "$as_me:42426: result: $cf_cv_term_header" >&5
+echo "$as_me:43129: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -42450,7 +43153,7 @@
 	;;
 esac
 
-echo "$as_me:42453: checking for unctrl.h" >&5
+echo "$as_me:43156: 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
@@ -42471,7 +43174,7 @@
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42474 "configure"
+#line 43177 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42485,16 +43188,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43191: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42491: \$? = $ac_status" >&5
+  echo "$as_me:43194: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42497: \$? = $ac_status" >&5
+  echo "$as_me:43200: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -42507,12 +43210,12 @@
 done
 
 fi
-echo "$as_me:42510: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:43213: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in #(vi
 no)
-	{ echo "$as_me:42515: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:43218: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -42568,10 +43271,10 @@
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:42571: checking for ${cf_func}" >&5
+	echo "$as_me:43274: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:42574: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:43277: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42580,7 +43283,7 @@
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 42583 "configure"
+#line 43286 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -42603,6 +43306,7 @@
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
+fprintf(stderr, "testing linkage of $cf_func:%p\n", foo);
 if (foo + 1234 > 5678)
 	${cf_cv_main_return:-return}(foo);
 #endif
@@ -42612,16 +43316,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42618: \$? = $ac_status" >&5
+  echo "$as_me:43322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42624: \$? = $ac_status" >&5
+  echo "$as_me:43328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -42637,7 +43341,7 @@
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:42640: result: $cf_result" >&5
+	echo "$as_me:43344: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -42653,13 +43357,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:42656: checking for $ac_func" >&5
+echo "$as_me:43360: 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 42662 "configure"
+#line 43366 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -42690,16 +43394,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42696: \$? = $ac_status" >&5
+  echo "$as_me:43400: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42702: \$? = $ac_status" >&5
+  echo "$as_me:43406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -42709,7 +43413,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42712: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:43416: 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
@@ -42723,12 +43427,12 @@
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:42726: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43430: 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:42731: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43435: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42736,7 +43440,7 @@
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:42739: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:43443: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -42750,7 +43454,7 @@
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:42753: checking for an rpath option" >&5
+echo "$as_me:43457: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in #(vi
 irix*) #(vi
@@ -42781,17 +43485,33 @@
 *)
 	;;
 esac
-echo "$as_me:42784: result: $LD_RPATH_OPT" >&5
+echo "$as_me:43488: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in #(vi
 x-R*)
-	echo "$as_me:42789: checking if we need a space after rpath option" >&5
+	echo "$as_me:43493: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
-	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
+
+cf_add_libs="${LD_RPATH_OPT}$libdir"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in $LIBS
+do
+	for cf_add_2lib in $cf_add_libs
+	do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
+		then
+			cf_add_1lib=
+			break
+		fi
+	done
+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+LIBS="$cf_add_libs"
+
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42794 "configure"
+#line 43514 "configure"
 #include "confdefs.h"
 
 int
@@ -42803,16 +43523,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42809: \$? = $ac_status" >&5
+  echo "$as_me:43529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42815: \$? = $ac_status" >&5
+  echo "$as_me:43535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -42822,13 +43542,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:42825: result: $cf_rpath_space" >&5
+	echo "$as_me:43545: 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:42831: checking if rpath-hack should be disabled" >&5
+echo "$as_me:43551: 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.
@@ -42845,21 +43565,21 @@
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:42848: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:43568: 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:42852: checking for updated LDFLAGS" >&5
+echo "$as_me:43572: 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:42855: result: maybe" >&5
+	echo "$as_me:43575: 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:42862: checking for $ac_word" >&5
+echo "$as_me:43582: 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
@@ -42874,7 +43594,7 @@
   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:42877: found $ac_dir/$ac_word" >&5
+echo "$as_me:43597: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42882,10 +43602,10 @@
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:42885: result: $cf_ldd_prog" >&5
+  echo "$as_me:43605: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:42888: result: no" >&5
+  echo "$as_me:43608: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42899,7 +43619,7 @@
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 42902 "configure"
+#line 43622 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42911,16 +43631,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42917: \$? = $ac_status" >&5
+  echo "$as_me:43637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42923: \$? = $ac_status" >&5
+  echo "$as_me:43643: \$? = $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`
@@ -42948,7 +43668,7 @@
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:42951: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:43671: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -42960,11 +43680,11 @@
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:42963: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43683: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:42967: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43687: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -43001,7 +43721,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:43004: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43724: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -43014,11 +43734,11 @@
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43017: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43737: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:43021: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43741: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -43055,7 +43775,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:43058: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43778: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -43068,14 +43788,14 @@
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:43071: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43791: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43075: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43795: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:43078: result: no" >&5
+	echo "$as_me:43798: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43176,7 +43896,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:43179: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:43899: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -43308,7 +44028,7 @@
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20121002,
+configured by $0, generated by GNU Autoconf 2.52.20141204,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -43352,7 +44072,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:43355: error: ambiguous option: $1
+    { { echo "$as_me:44075: 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;}
@@ -43371,7 +44091,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:43374: error: unrecognized option: $1
+  -*) { { echo "$as_me:44094: 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;}
@@ -43390,7 +44110,7 @@
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20121002, executed with
+This file was extended by $as_me 2.52.20141204, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -43424,7 +44144,7 @@
   "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:43427: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:44147: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -43758,7 +44478,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:43761: creating $ac_file" >&5
+    { echo "$as_me:44481: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -43776,7 +44496,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:43779: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44499: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -43789,7 +44509,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:43792: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44512: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -43805,7 +44525,7 @@
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:43808: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:44528: 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;}
@@ -43814,7 +44534,7 @@
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:43817: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:44537: 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;}
@@ -43851,7 +44571,7 @@
             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:43854: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:44574: 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;}
@@ -43862,7 +44582,7 @@
     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:43865: WARNING: Some variables may not be substituted:
+      { echo "$as_me:44585: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -43911,7 +44631,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:43914: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:44634: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -43922,7 +44642,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:43925: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44645: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -43935,7 +44655,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:43938: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44658: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -44053,7 +44773,7 @@
   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:44056: $ac_file is unchanged" >&5
+      { echo "$as_me:44776: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: configure.in
--- 2.8.9dev.1/configure.in	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/configure.in	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.268 2014/03/10 22:07:34 tom Exp $
+dnl $LynxId: configure.in,v 1.269 2014/03/16 15:03:40 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.1)
+AC_REVISION(2.8.9dev.2)
 
 # 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 @@
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.1
+VERSION=2.8.9dev.2
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
Index: lynx.cfg
--- 2.8.9dev.1/lynx.cfg	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/lynx.cfg	Mon Dec 22 01:39:40 2014
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.247 2014/03/10 22:07:34 tom Exp $
+# $LynxId: lynx.cfg,v 1.249 2014/03/16 15:03:40 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.1"
+#PRCS LYNX_VERSION "2.8.9dev.2"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Wed, 12 Mar 2014 12:14:45 -0700"
+#PRCS LYNX_DATE "Sun, 21 Dec 2014 17:39:40 -0800"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
Index: makefile.in
--- 2.8.9dev.1/makefile.in	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/makefile.in	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.146 2014/03/10 22:07:34 tom Exp $
+# $LynxId: makefile.in,v 1.147 2014/03/16 15:03:40 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,7 @@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9dev.1
+LYNX_VERSION	= 2.8.9dev.2
 
 ## 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.
Index: po/eo.po
--- 2.8.9dev.1/po/eo.po	Thu Aug 16 00:47:03 2012
+++ 2.8.9dev.2/po/eo.po	Mon Dec 22 01:39:40 2014
@@ -7,7 +7,7 @@
 "Project-Id-Version: lynx 2.8.8-dev9\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-12 19:13-0500\n"
-"PO-Revision-Date: 2012-03-07 00:56-0500\n"
+"PO-Revision-Date: 2014-02-08 15:11-0500\n"
 "Last-Translator: Keith Bowes <zooplah@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -94,7 +94,7 @@
 
 #: LYMessages.c:44
 msgid ", help on "
-msgstr ", helpo pri"
+msgstr ", helpo pri "
 
 #. #define HELP
 #: LYMessages.c:46
@@ -212,12 +212,12 @@
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
 #: LYMessages.c:93
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
-msgstr "(retpoÅ�ta kampo) Enmetu tekston. Uzu enen-klavon por sendi, sagoklavojn por de movi de Ä�i."
+msgstr "(retpoÅ�ta kampo) Enmetu tekston. Uzu enen-klavon por sendi, sagoklavojn por movi de Ä�i."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
 #: LYMessages.c:95
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
-msgstr "(retpoÅ�ta kampo) RetpoÅ�to estas malaktiva. Vi ne eblas sendi tion."
+msgstr "(retpoÅ�ta kampo) RetpoÅ�to estas malaktiva. Vi ne rajtas sendi tion."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
 #: LYMessages.c:97
@@ -287,7 +287,7 @@
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
 #: LYMessages.c:123
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
-msgstr "(retpoÅ�ta sendobutono) RetpoÅ�to estas malaktiva. Vi ne eblas sendi tion."
+msgstr "(retpoÅ�ta sendobutono) RetpoÅ�to estas malaktiva. Vi ne rajtas sendi tion."
 
 #. #define FORM_LINK_RESET_MESSAGE
 #: LYMessages.c:125
@@ -377,7 +377,7 @@
 #: LYMessages.c:154
 #, c-format
 msgid "Skipping %s"
-msgstr "Preterpasante je %s"
+msgstr "Preterlasante je %s"
 
 #: LYMessages.c:155
 #, c-format
@@ -441,7 +441,7 @@
 #. #define NOVICE_LINE_TWO_B
 #: LYMessages.c:173
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
-msgstr "O) Aliaj komandoj B) RetropaÅ�i E) Redakti D) ElÅ�uti ^R)eÅ�argi ^W) ForviÅ�i ekranon serÄ‰i en dokumento: / \n"
+msgstr "  O) Aliaj komandoj B) RetropaÅ�i E) Redakti D) ElÅ�uti ^R)eÅ�argi ^W) ForviÅ�i ekranon  serÄ‰i en dokumento: / \n"
 
 #. #define NOVICE_LINE_TWO_C
 #: LYMessages.c:175
@@ -456,24 +456,24 @@
 #. #define FORM_NOVICELINE_TWO
 #: LYMessages.c:179
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
-msgstr "    ^U por forviÅ�i la kampon, [RetropaÅ�o] forigi signon    "
+msgstr "    ^U por forviÅ�i la kampon, [RetropaÅ�o] por forigi signon    "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
 #: LYMessages.c:181
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
-msgstr "    ^U por forviÅ�i la kampon, [RetropaÅ�o] forigi signon    "
+msgstr "    ^U por forviÅ�i la kampon, [RetropaÅ�o] por forigi signon    "
 
 #. #define FORM_NOVICELINE_TWO_VAR
 #: LYMessages.c:183
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
-msgstr "    %s por forviÅ�i la kampon, [RetropaÅ�o] forigi signon    "
+msgstr "    %s por forviÅ�i la kampon, [RetropaÅ�o] por forigi signon    "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
 #: LYMessages.c:185
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
-msgstr "    %s por forviÅ�i la kampon, [RetropaÅ�o] forigi signon    "
+msgstr "    %s por forviÅ�i la kampon, [RetropaÅ�o] por forigi signon    "
 
 #. mailto
 #: LYMessages.c:188
@@ -552,7 +552,7 @@
 
 #: LYMessages.c:212
 msgid "Not in a TEXTAREA; cannot use command."
-msgstr "Ne en TEKSTREGIONO; ne eblaas uzi komandon."
+msgstr "Ne en TEKSTREGIONO; ne eblas uzi komandon."
 
 #: LYMessages.c:214
 msgid "file: ACTIONs are disallowed!"
@@ -583,7 +583,7 @@
 #. #define SPAWNING_MSG
 #: LYMessages.c:224
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
-msgstr "Kreante DCL-subprocezon.  Uzu la komandon 'logout' por reiri al Linko.\n"
+msgstr "Kreante DCL-subprocezon. Uzu la komandon 'logout' por reiri al Linko.\n"
 
 #. #define SPAWNING_MSG
 #: LYMessages.c:228
@@ -593,7 +593,7 @@
 #. #define SPAWNING_MSG
 #: LYMessages.c:231
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
-msgstr "Kreante vian aprioran Å�elon. Tajpe la vorton 'exit' por reiri al Linko.\n"
+msgstr "Kreante vian aprioran Å�elon. Tajpu la vorton 'exit' por reiri al Linko.\n"
 
 #: LYMessages.c:234
 msgid "Spawning is currently disabled."
@@ -605,7 +605,7 @@
 
 #: LYMessages.c:236
 msgid "You cannot download an input field."
-msgstr "Vi ne eblas elÅ�uti tekstan kampon."
+msgstr "Vi ne rajtas elÅ�uti tekstan kampon."
 
 #: LYMessages.c:237
 msgid "Form has a mailto action!  Cannot download."
@@ -617,19 +617,19 @@
 
 #: LYMessages.c:239
 msgid "You cannot download cookies."
-msgstr "Vi ne eblas elÅ�uti kuketojn."
+msgstr "Vi ne rajtas elÅ�uti kuketojn."
 
 #: LYMessages.c:240
 msgid "You cannot download a printing option."
-msgstr "Vi ne eblas elÅ�uti printan elekton."
+msgstr "Vi ne rajtas elÅ�uti printan elekton."
 
 #: LYMessages.c:241
 msgid "You cannot download an upload option."
-msgstr "Vi ne eblas elÅ�uti alÅ�utan elekton."
+msgstr "Vi ne rajtas elÅ�uti alÅ�utan elekton."
 
 #: LYMessages.c:242
 msgid "You cannot download an permit option."
-msgstr "Vi ne eblas elÅ�uti permesan elekton."
+msgstr "Vi ne rajtas elÅ�uti permesan elekton."
 
 #: LYMessages.c:243
 msgid "This special URL cannot be downloaded!"
@@ -860,42 +860,42 @@
 #. #define HISTORICAL_ON_MINIMAL_OFF
 #: LYMessages.c:319
 msgid "Historical comment parsing ON (Minimal is overridden)!"
-msgstr "Historia komenta interpretado ÅœALTITA!"
+msgstr "Historia komento-interpretado ÅœALTITA (Minimuma estas malaktiva)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
 #: LYMessages.c:321
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
-msgstr "Historia komenta interpretado MALÅœALTITA!"
+msgstr "Historia komento-interpretado MALÅœALTITA (Minimuma estas aktiva)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
 #: LYMessages.c:323
 msgid "Historical comment parsing ON (Valid is overridden)!"
-msgstr "Historia komenta interpretado ÅœALTITA!"
+msgstr "Historia komento-interpretado ÅœALTITA (Valida estas malaktiva)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
 #: LYMessages.c:325
 msgid "Historical comment parsing OFF (Valid is in effect)!"
-msgstr "Historia komenta interpretado MALÅœALTITA!"
+msgstr "Historia komento-interpretado MALÅœALTITA (Valida estas aktiva)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
 #: LYMessages.c:327
 msgid "Minimal comment parsing ON (and in effect)!"
-msgstr "Historia komenta interpretado ÅœALTITA!"
+msgstr "Minimuma komento-interpretado ÅœALTITA (kaj aktiva)!"
 
 #. #define MINIMAL_OFF_VALID_ON
 #: LYMessages.c:329
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
-msgstr "Historia komenta interpretado MALÅœALTITA!"
+msgstr "Minimuma komento-interpretado MALÅœALTITA (Valida estas aktiva)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
 #: LYMessages.c:331
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
-msgstr "Historia komenta interpretado ÅœALTITA!"
+msgstr "Minimuma komento-interpretado ÅœALTITA (sed Historia estas aktiva)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
 #: LYMessages.c:333
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
-msgstr "Historia komenta interpretado MALÅœALTITA!"
+msgstr "Minimuma komento-interpretado MALÅœALTITA (Historia estas aktiva)!"
 
 #: LYMessages.c:334
 msgid "Soft double-quote parsing ON!"
@@ -998,7 +998,7 @@
 #: LYMessages.c:361
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
-msgstr "Vi ne eblas iri al retadresoj de \"%s\""
+msgstr "Vi ne rajtas iri al retadresoj de \"%s\""
 
 #: LYMessages.c:362
 msgid "URL to open: "
@@ -1034,7 +1034,7 @@
 
 #: LYMessages.c:370
 msgid "You cannot edit File Management URLs"
-msgstr "Vi ne eblas redakti dosieradministradajn retadresojn"
+msgstr "Vi ne rajtas redakti dosieradministradajn retadresojn"
 
 #: LYMessages.c:371
 msgid "Enter a database query: "
@@ -1100,7 +1100,7 @@
 
 #: LYMessages.c:387
 msgid "No index is currently available."
-msgstr "Neniu indekso aktuale haveblas."
+msgstr "Neniu indekso aktuale disponeblas."
 
 #. #define CONFIRM_MAIN_SCREEN
 #: LYMessages.c:389
@@ -1132,7 +1132,7 @@
 
 #: LYMessages.c:397
 msgid "Mail is disallowed so you cannot send a comment"
-msgstr "RetpoÅ�to estas malaktiva. Vi ne eblas sendi komenton."
+msgstr "RetpoÅ�to estas malaktiva. Vi ne rajtas sendi komenton."
 
 #: LYMessages.c:398
 msgid "The 'e'dit command is currently disabled."
@@ -1528,7 +1528,7 @@
 
 #: LYMessages.c:514
 msgid "Can't open file for reading."
-msgstr "Vi ne eblas malfermi dosieron por legado."
+msgstr "Ne eblas malfermi dosieron por legado."
 
 #: LYMessages.c:515
 msgid "File does not exist."
@@ -1630,7 +1630,7 @@
 
 #: LYMessages.c:542
 msgid "Image map from POST response not available!"
-msgstr "Bildmapo de kaÅ�ita respondo ne haveblas!"
+msgstr "Bildmapo de kaÅ�ita respondo ne disponeblas!"
 
 #: LYMessages.c:543
 msgid "Misdirected client-side image MAP request!"
@@ -1642,11 +1642,11 @@
 
 #: LYMessages.c:545
 msgid "No client-side image MAPs are available!"
-msgstr "Neniuj enklientaj bildmapoj haveblas!"
+msgstr "Neniuj enklientaj bildmapoj disponeblas!"
 
 #: LYMessages.c:546
 msgid "Client-side image MAP is not available!"
-msgstr "Enklienta bildmapo ne haveblas!"
+msgstr "Enklienta bildmapo ne disponeblas!"
 
 #. #define OPTION_SCREEN_NEEDS_24
 #: LYMessages.c:549
@@ -1924,7 +1924,7 @@
 
 #: LYMessages.c:633
 msgid "Cannot POST to this host."
-msgstr "Ne eblas sendi kaÅ�itajn datumojn al tiu gastiganto."
+msgstr "Ne eblas sendi kaÅ�itajn datumojn al tiu retnodo."
 
 #: LYMessages.c:634
 msgid "POST not supported for this URL - ignoring POST data!"
@@ -2000,7 +2000,7 @@
 #. #define USE_PATH_OFF_HOME
 #: LYMessages.c:656
 msgid "Use a filepath off your login directory in SHELL syntax!"
-msgstr "Uzu dosiervojon de via hejdosierujo laÅ­ SHELL-sintakson!"
+msgstr "Uzu dosiervojon de via hejmdosierujo laÅ­ SHELL-sintakso!"
 
 #: LYMessages.c:658
 msgid "Use a filepath off your home directory!"
@@ -2009,7 +2009,7 @@
 #. #define MAXLINKS_REACHED
 #: LYMessages.c:661
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
-msgstr "Maksimumaj ligiloj je Ä‰iu ekranpleno preterpasis! Uzu duonekranplenan aÅ­ dulinian rulumadon."
+msgstr "Maksimumaj ligiloj je Ä‰iu ekranpleno preteriris! Uzu duonekranplenan aÅ­ dulinian rulumadon."
 
 #: LYMessages.c:662
 msgid "No previously visited links available!"
@@ -2029,7 +2029,7 @@
 
 #: LYMessages.c:666
 msgid "Directory/File Manager not available"
-msgstr "Dosieradministrilo ne haveblas"
+msgstr "Dosieradministrilo ne disponeblas"
 
 #: LYMessages.c:667
 msgid "HREF in BASE tag is not an absolute URL."
@@ -2196,7 +2196,7 @@
 #: LYMessages.c:699
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
-msgstr "%s kuketo: %.*s=%.*s Äˆu Permesi? (J/N/Ä‰Iam/nEniam)"
+msgstr "%s kuketo: %.*s=%.*s Äˆu Permesi? (J/N/Ä‰iAm/nEniam)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
 #: LYMessages.c:701
@@ -2220,20 +2220,20 @@
 
 #: LYMessages.c:706
 msgid "The Cookie Jar is empty."
-msgstr "La kuketa skatolo estas vaka."
+msgstr "La kuketo-skatolo estas vaka."
 
 #: LYMessages.c:707
 msgid "The Cache Jar is empty."
-msgstr "La teneja skatolo estas vaka."
+msgstr "La tenejo-skatolo estas vaka."
 
 #. #define ACTIVATE_TO_GOBBLE
 #: LYMessages.c:709
 msgid "Activate links to gobble up cookies or entire domains,"
-msgstr "Aktivigi ligilojn por vori kuketojn aÅ­ tutajn domajnojn."
+msgstr "Aktivigi ligilojn por vori kuketojn aÅ­ tutajn domajnojn"
 
 #: LYMessages.c:710
 msgid "or to change a domain's 'allow' setting."
-msgstr "aÅ­ Å�anÄ�i permeson de domajno."
+msgstr "aÅ­ por Å�anÄ�i permeson de domajno."
 
 #: LYMessages.c:711
 msgid "(Cookies never allowed.)"
@@ -2541,7 +2541,7 @@
 #: LYMessages.c:794
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
-msgstr "Silo %d '%s' SGML:%s.  Tiparo %s %.lf punkto.\n"
+msgstr "Silo %d '%s' SGML:%s. Tiparo %s %.lf punktoj.\n"
 
 #: LYMessages.c:796
 #, c-format
@@ -2618,7 +2618,7 @@
 
 #: LYMessages.c:820
 msgid "Cookie Jar"
-msgstr "Kuketa skatolo"
+msgstr "Kuketo-skatolo"
 
 #: LYMessages.c:821
 msgid "Current Key Map"
@@ -2634,11 +2634,11 @@
 
 #: LYMessages.c:824
 msgid "History Page"
-msgstr "Historia paÄ�o"
+msgstr "Historio-paÄ�o"
 
 #: LYMessages.c:825
 msgid "Cache Jar"
-msgstr "Teneja skatolo"
+msgstr "Tenejo-skatolo"
 
 #: LYMessages.c:826
 msgid "List Page"
@@ -2867,7 +2867,7 @@
 
 #: WWW/Library/Implementation/HTFTP.c:877
 msgid "Unable to connect to FTP host."
-msgstr "Ne eblas konektiÄ�i al FTP-gastiganto."
+msgstr "Ne eblas konektiÄ�i al FTP-retnodo."
 
 #: WWW/Library/Implementation/HTFTP.c:1158
 msgid "close master socket"
@@ -2900,7 +2900,7 @@
 
 #: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
-msgstr "Ne povis Å�argi datumojn (neniu gastigantonomo en finger-adreso)"
+msgstr "Ne povis Å�argi datumojn (neniu retnodonomo en finger-retadreso)"
 
 #: WWW/Library/Implementation/HTFinger.c:329
 msgid "Invalid port number - will only use port 79!"
@@ -2908,7 +2908,7 @@
 
 #: WWW/Library/Implementation/HTFinger.c:395
 msgid "Could not access finger host."
-msgstr "Ne povis atingi finger-gastiganton."
+msgstr "Ne povis atingi finger-retnodon."
 
 #: WWW/Library/Implementation/HTFinger.c:403
 msgid "No response from finger server."
@@ -2917,7 +2917,7 @@
 #: WWW/Library/Implementation/HTNews.c:421
 #, c-format
 msgid "Username for news host '%s':"
-msgstr "Salutnomo por novaÄµgrupa gastiganto '%s':"
+msgstr "Salutnomo por novaÄµgrupa retnodo '%s':"
 
 #: WWW/Library/Implementation/HTNews.c:474
 msgid "Change username?"
@@ -2930,7 +2930,7 @@
 #: WWW/Library/Implementation/HTNews.c:503
 #, c-format
 msgid "Password for news host '%s':"
-msgstr "Pasvorto por novaÄµgrupa gastiganto '%s':"
+msgstr "Pasvorto por novaÄµgrupa retnodo '%s':"
 
 #: WWW/Library/Implementation/HTNews.c:586
 msgid "Change password?"
@@ -3002,7 +3002,7 @@
 
 #: WWW/Library/Implementation/HTNews.c:2575
 msgid "Connecting to NewsHost ..."
-msgstr "Konektanta al novaÄµgrupa gastiganto..."
+msgstr "Konektanta al novaÄµgrupa retnodo..."
 
 #: WWW/Library/Implementation/HTNews.c:2627
 #, c-format
@@ -3017,7 +3017,7 @@
 #: WWW/Library/Implementation/HTNews.c:2737
 #, c-format
 msgid "Can't read news info, empty response from host %s"
-msgstr "Ne eblas legi informojn. Vaka respondo de gastiganto %s"
+msgstr "Ne eblas legi informojn. Vaka respondo de retnodo %s"
 
 #.
 #. * List available newsgroups.  - FM
@@ -3053,7 +3053,7 @@
 #: WWW/Library/Implementation/HTTCP.c:1640
 #, c-format
 msgid "Unable to locate remote host %s."
-msgstr "Ne eblas loki foran gastiganton %s."
+msgstr "Ne eblas loki foran retnodon %s."
 
 #. Not HTProgress, so warning won't be overwritten immediately;
 #. * but not HTAlert, because typically there will be other
@@ -3063,7 +3063,7 @@
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
-msgstr "Nevalida gastigantonomo %s"
+msgstr "Nevalida retnodonomo %s"
 
 #: WWW/Library/Implementation/HTTCP.c:1651
 #, c-format
@@ -3116,7 +3116,7 @@
 
 #: WWW/Library/Implementation/HTTP.c:698
 msgid "Unable to connect to remote host."
-msgstr "Ne eblas konektiÄ�i al fora gastiganto."
+msgstr "Ne eblas konektiÄ�i al fora retnodo."
 
 #: WWW/Library/Implementation/HTTP.c:730
 msgid "Retrying connection without TLS."
@@ -3136,7 +3136,7 @@
 
 #: WWW/Library/Implementation/HTTP.c:779
 msgid "the certificate has been revoked"
-msgstr "la atestilo estis forprenita"
+msgstr "la atestilo estas forprenita"
 
 #: WWW/Library/Implementation/HTTP.c:781
 msgid "the certificate is not trusted"
@@ -3159,7 +3159,7 @@
 #: WWW/Library/Implementation/HTTP.c:978
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
-msgstr "SSL eraro:gastiganto(%s)!=cert(%s)-Äˆu daÅ­ri?"
+msgstr "SSL eraro:retnodo(%s)!=cert(%s)-Äˆu daÅ­ri?"
 
 #: WWW/Library/Implementation/HTTP.c:991
 #, c-format
@@ -3624,7 +3624,7 @@
 #.
 #: src/HTAlert.c:913
 msgid "Y/N/A/V"
-msgstr "J/N/I/E"
+msgstr "J/N/A/E"
 
 #: src/HTML.c:5915
 msgid "Description:"
@@ -3636,7 +3636,7 @@
 
 #: src/HTML.c:5924
 msgid "Filepath:"
-msgstr "(Dosiera vojo):"
+msgstr "Dosiervojo:"
 
 #: src/HTML.c:5930
 msgid "(unknown)"
@@ -3662,7 +3662,9 @@
 "     been remapped by you or your system administrator."
 msgstr ""
 "    Äˆi tiu dosiero estas HTML-prezento de la legosignoj de X Mosaic.\n"
-"    Malmodernaj aÅ­ nevalidaj ligiloj povas esti forigitaj per uzi la    komandon 'forigi legosignon'. Ordinare Ä�i estas la klavo 'R', sed eble    vi aÅ­ via sistemestro Å�anÄ�is Ä�in."
+"    Malmodernaj aÅ­ nevalidaj ligiloj povas esti forigitaj per uzi la\n"
+"    komandon 'forigi legosignon'. Ordinare Ä�i estas la klavo\n"
+"    'R', sed eble    vi aÅ­ via sistemestro Å�anÄ�is Ä�in."
 
 #: src/LYBookmark.c:376
 #, c-format
@@ -3679,9 +3681,8 @@
 "     the 'R' key but may have been remapped by you or your system\n"
 "     administrator."
 msgstr ""
-"     Vi povas forigi ligilojn uzantaj la komandon 'forigi legosignon'. Äœi ordinare\n"
-"     estas la klavo 'R', sed eble vi aÅ­ via sistemestro\n"
-"     Å�anÄ�is Ä�in."
+"     Vi povas forigi ligilojn uzante la komandon 'forigi legosignon'. Äœi ordinare\n"
+"     estas la klavo 'R', sed eble vi aÅ­ via sistemestro Å�anÄ�is Ä�in."
 
 #: src/LYBookmark.c:383
 msgid ""
@@ -3698,10 +3699,10 @@
 "      or add other HTML markup.\n"
 "      Make sure any bookmark link is saved as a single line."
 msgstr ""
-"Noto: Se vi redakti Ä‰i tiun dosieron permane\n"
-"      vi ne Å�anÄ�u la aranÄ�on en la linioj\n"
+"Noto: Se vi redaktus Ä‰i tiun dosieron permane\n"
+"      vi devas ne Å�anÄ�i la aranÄ�on en la linioj\n"
 "      aÅ­ aldoni aliajn HTML-markojn.\n"
-"      Certigi, ke legosignan ligilon estas en precize unu linio."
+"      Certigi, ke legosigna ligilo estas en precize unu linio."
 
 #: src/LYBookmark.c:684
 #, c-format
@@ -3727,7 +3728,7 @@
 
 #: src/LYCgi.c:714
 msgid "An excellent http server for VMS is available via"
-msgstr "Bonega HTTP-servilo por VMBS haveblas per"
+msgstr "Bonega HTTP-servilo por VMS disponeblas per"
 
 #: src/LYCgi.c:721
 msgid "this link"
@@ -4281,7 +4282,7 @@
 "\n"
 msgstr ""
 "\n"
-"Agorda dosiero \"%s\" ne haveblas.\n"
+"Agorda dosiero \"%s\" ne disponeblas.\n"
 "\n"
 
 #: src/LYMain.c:1497
@@ -4314,13 +4315,13 @@
 "\n"
 msgstr ""
 "\n"
-"Linko-dosiero \"%s\" ne haveblas.\n"
+"Linko-dosiero \"%s\" ne disponeblas.\n"
 "\n"
 
 #: src/LYMain.c:1683
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
-msgstr "Ignoris %d signojn el ordinara enigo.\n"
+msgstr "Ignoris %d signojn el la Ä‰efenigujo.\n"
 
 #: src/LYMain.c:1685
 #, c-format
@@ -5231,7 +5232,7 @@
 #: src/LYReadCFG.c:922
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
-msgstr "Linko: ne eblas starti, CERN-regula dosiero %s ne haveblas\n"
+msgstr "Linko: ne eblas starti, CERN-regula dosiero %s ne disponeblas\n"
 
 #: src/LYReadCFG.c:923
 msgid "(no name)"
@@ -5365,7 +5366,7 @@
 
 #: src/LYShowInfo.c:324 src/LYShowInfo.c:339
 msgid "Charset:"
-msgstr "kodoprezento:"
+msgstr "Kodoprezento:"
 
 #: src/LYShowInfo.c:338
 msgid "(assumed)"
@@ -5389,7 +5390,7 @@
 
 #: src/LYShowInfo.c:359
 msgid "Cache-Control:"
-msgstr "Cache-Control:"
+msgstr "Tenejo-Kontrolo:"
 
 #: src/LYShowInfo.c:362
 msgid "Content-Length:"
@@ -5417,7 +5418,7 @@
 
 #: src/LYShowInfo.c:389
 msgid "size:"
-msgstr "grando:"
+msgstr "Grando:"
 
 #: src/LYShowInfo.c:391
 msgid "lines"
@@ -5457,7 +5458,7 @@
 
 #: src/LYShowInfo.c:415
 msgid "mode:"
-msgstr "reÄ�imo:"
+msgstr "ReÄ�imo:"
 
 #: src/LYShowInfo.c:421
 msgid "Link that you currently have selected"
@@ -5506,7 +5507,7 @@
 
 #: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
-msgstr "jen listo de la historia stako por ke vi povu rekonstrui"
+msgstr "jen listo de la historio-stako por ke vi povu rekonstrui"
 
 #: src/LYUpload.c:77
 msgid "ERROR! - upload command is misconfigured"
@@ -5638,7 +5639,7 @@
 msgstr ""
 "cookie_accept_domains kaj cookie_reject domains estas listoj de domajnoj\n"
 "el kiuj Linko aÅ­tomate akceptu aÅ­ rifuzu (respektive) Ä‰iujn kuketojn,\n"
-"apartigante de komoj. Se domajno estas specifita en ambaÅ­ agordaÄµoj, rifuzado\n"
+"apartigita per komoj. Se domajno estas specifita en ambaÅ­ agordaÄµoj, rifuzado\n"
 "regos. La parametro accept_all_cookies superregos Ä‰iujn\n"
 "agordaÄµojn Ä‰i tie.\n"
 
@@ -5661,11 +5662,11 @@
 "querying the user for an invalid path or domain.\n"
 msgstr ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, kaj\n"
-"cookie_query_invalid_domains estas listoj, apartigantaj de komoj, de kiuj domajnoj\n"
-"estu submetita al variantaj gradoj de kontrolado. Se vi specifas,\n"
+"cookie_query_invalid_domains estas listoj, apartigita per komoj, de kiuj domajnoj\n"
+"estu submetitaj al variantaj gradoj de kontrolado. Se vi specifas,\n"
 "ke domajno ricevos severan kontroladon, severa konformado al RFC2109\n"
-"aplikiÄ�os. Domajno kun malsevera kontrolado estos permesita doni kuketojn\n"
-"kun nevalidaj atributoj vojo kaj domajno. Äˆiuj domajno aÅ­tomate estos demandi\n"
+"aplikiÄ�os. Domajno kun malsevera kontrolado estos permesita doni al kuketoj\n"
+"kun nevalidaj atributoj vojon kaj domajnon. Äˆiuj domajnoj aÅ­tomate demandos\n"
 "al la uzanto pri nevalida vojo aÅ­ domajno.\n"
 
 #: src/LYrcFile.c:386
@@ -5887,7 +5888,7 @@
 "Ä‰iuj lokaj plenumeblaj ligiloj trovitaj en LOKAJ dosieroj\n"
 "estos plenumigitaj kiam ili estas elektitaj.\n"
 "Äˆi tio estas malsama de run_execution_links pro tio, ke nur dosieroj,\n"
-"kiuj estas en via laka komputilo estos plenumeblaj.\n"
+"kiuj estas en via loka komputilo estos plenumeblaj.\n"
 "\n"
 "ATENTO - Tio estas eventuale TRE danÄ�era pro\n"
 "eventualaj nekonataj fontoj.\n"
@@ -5909,7 +5910,7 @@
 "select_popups specifas Ä‰u la elektoj en elektiloj, kiuj\n"
 "povas havi nur unu elekton, estas prezentitaj kiel vertikala listo da\n"
 "radiobutonoj aÅ­ Å�prucmenuo. Notu, ke se la elekto permesas plurajn elektojn,\n"
-"Linko Ä‰iam kreos vertikalan liston de markobutonojn por la elektoj.\n"
+"Linko Ä‰iam kreos vertikalan liston de markobutonoj por la elektoj.\n"
 "Valoro de \"on\" specifas, ke aro da Å�prucmenuoj estas preferataj.\n"
 "Valoro de \"off\" specifas, ke aro da radiobutonoj estas preferataj.\n"
 "La aÅ­tomatan valoron oni povas nuligi per la komandlinian parametron -popup.\n"
@@ -5934,7 +5935,7 @@
 msgstr ""
 "show_color specifas, kiel agordi kolorreÄ�imon dum plenumo. Valoro de\n"
 "\"never\" devigos kolorreÄ�imon malÅ�altita (trakti la terminalon kiel unukoloran)\n"
-"dum plenumo, eÄ‰ se la terminalo Å�ajnas esti kolorhava. Valoro de\n"
+"dum plenumo, eÄ‰ se la terminalo Å�ajnas esti plurkolora. Valoro de\n"
 "\"always\" devigos kolorreÄ�imon Å�altita eÄ‰ se la terminalo Å�ajnas esti\n"
 "unuklora, se tio estas regata de la biblioteko uzata por munti Linkon.\n"
 "Valoro de \"default\" cedos la konduton de supozado\n"
@@ -5981,7 +5982,7 @@
 "show_dotfiles specifas, ke la dosierujlisto inkluzivu\n"
 "\"kaÅ�atajn\" (punktajn) dosier(uj)ojn. Valoro de \"on\" estos\n"
 "obeataj nur se ebligitaj per userdefs.h kajaÅ­ lynx.cfg, kaj ne\n"
-"malhelpita per komandlinia parametro. Se montrado de kaÅ�ataj dosieroj\n"
+"malÅ�altita per komandlinia parametro. Se montrado de kaÅ�ataj dosieroj\n"
 "estas malebligita, kredado de tiaj dosieroj en Linko ankaÅ­ estas malebligita.\n"
 
 #: src/LYrcFile.c:584
@@ -6002,7 +6003,7 @@
 "Linko-bookmark_file estas difinita (vidu supre), Ä�i estos uzita kiel la\n"
 "aÅ­tomata elekto. Kiam la valoro de tiu agordaÄµo estas \"advanced\", kaj la\n"
 "uzantoreÄ�imo estas altnivela, la komandon \"'v'idi legosignojn\" kreos\n"
-"statlinian demandilon antstataÅ­ la menuo vidata en la uzantoreÄ�imoj novula kaj meznivela\n"
+"statlinian demandilon anstataÅ­ la menuo vidata en la uzantoreÄ�imoj novula kaj meznivela\n"
 "Kiam tiu elekto estas \"standard\", la menuo estos\n"
 "prezentita senkonsidere de uzantoreÄ�imo.\n"
 
@@ -6095,7 +6096,7 @@
 "formulara kampo aÅ­ butono. Aldone elektoj en elektiloj estas indicitaj\n"
 "por ke la uzanto povu tajpi elektan ciferon por elekti elekton en\n"
 "Å�prucmenuoj, eÄ‰ se la elekto ne estas videbla sur la ekrano. Referencaj\n"
-"listoj kaj eligoj de la lista komando ankaÅ­ ciferigas formularajn aÄµojn.\n"
+"listoj kaj eligoj de la lista komando ankaÅ­ nombras formularajn aÄµojn.\n"
 
 #: src/LYrcFile.c:867
 msgid ""
@@ -6131,7 +6132,7 @@
 "checkbox:\n"
 msgstr ""
 "Vi devas poste konservi la agordaÄµojn per la ligilo en la linio supra\n"
-"al la markobutonon\n"
+"al la markobutono:\n"
 
 #: src/LYrcFile.c:922
 msgid ""
@@ -6172,3 +6173,18 @@
 "Se vi serÄ‰as la Ä�eneralan agordo-dosieron - Ä�i ordinare\n"
 "nomiÄ�as \"lynx.cfg\". Äœi havas malsaman enhavon kaj formaton.\n"
 "Äœi ne estas Ä‰i tiu dosiero.\n"
+
+#~ msgid "Current Edit-Key Map"
+#~ msgstr "Nuna redaktoklavomapo"
+
+#~ msgid "Terminal reinitialisation failed - unknown terminal type?"
+#~ msgstr "Terminala restartigo malsukcesis - Ä‰u nekonata terminala tipo?"
+
+#~ msgid "Show %s/sec (2-digits), ETA"
+#~ msgstr "Montru aproksimatan %sn en sekundo (duciferan)"
+
+#~ msgid "Color style"
+#~ msgstr "Kolora stilo"
+
+#~ msgid "Default colors"
+#~ msgstr "Aprioraj koloroj"
Index: po/id.po
--- 2.8.9dev.1/po/id.po	Mon Feb  2 01:41:02 2009
+++ 2.8.9dev.2/po/id.po	Mon Dec 22 01:39:40 2014
@@ -1,16 +1,17 @@
 # Pesan bahasa indonesia untuk lynx
 # Copyright (C) 2008 Arif E. Nugroho <arif_endro@yahoo.com>
 # This file is distributed under the same license as the lynx package.
-# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009.
+# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.7-dev12\n"
+"Project-Id-Version: lynx 2.8.8-dev9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-01 20:55-0500\n"
-"PO-Revision-Date: 2009-01-01 18:53+0700\n"
+"POT-Creation-Date: 2012-02-12 19:13-0500\n"
+"PO-Revision-Date: 2014-08-09 18:53+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,2010 +26,2024 @@
 #. * debugging (CTRACE) or (b) are constants used in interaction with
 #. * other programs.
 #. *
-#. * Links to collections of alternate definitions, developed by the Lynx
-#. * User Community, are maintained in Lynx links:
-#. *
-#. *    http://www.subir.com/lynx.html
-#. *
 #. * See ABOUT-NLS and po/readme for details and location of contributed
 #. * translations.  When no translation is available, the English default is
 #. * used.
 #.
-#: LYMessages.c:32
+#: LYMessages.c:27
 #, c-format
 msgid "Alert!: %s"
 msgstr "Peringatan!: %s"
 
-#: LYMessages.c:33
+#: LYMessages.c:28
 msgid "Welcome"
 msgstr "Selamat datang"
 
-#: LYMessages.c:34
+#: LYMessages.c:29
 msgid "Are you sure you want to quit?"
 msgstr "Apakah anda yakin anda ingin berhenti"
 
-#: LYMessages.c:36
+#: LYMessages.c:31
 msgid "Really exit from Lynx?"
 msgstr "Benar benar keluar dari Lynx?"
 
-#: LYMessages.c:38
+#: LYMessages.c:33
 msgid "Connection interrupted."
 msgstr "Koneksi terinterupsi."
 
-#: LYMessages.c:39
+#: LYMessages.c:34
 msgid "Data transfer interrupted."
 msgstr "Transfer data terinterupsi."
 
-#: LYMessages.c:40
+#: LYMessages.c:35
 msgid "Cancelled!!!"
 msgstr "Dibatalkan!!!"
 
-#: LYMessages.c:41
+#: LYMessages.c:36
 msgid "Cancelling!"
 msgstr "Membatalkan!"
 
-#: LYMessages.c:42
+#: LYMessages.c:37
 msgid "Excellent!!!"
 msgstr "Ekselen!!!"
 
-#: LYMessages.c:43
+#: LYMessages.c:38
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:44
+#: LYMessages.c:39
 msgid "Done!"
 msgstr "Selesai!"
 
-#: LYMessages.c:45
+#: LYMessages.c:40
 msgid "Bad request!"
 msgstr "Permintaan buruk!"
 
-#: LYMessages.c:46
+#: LYMessages.c:41
 msgid "previous"
 msgstr "sebelumnya"
 
-#: LYMessages.c:47
+#: LYMessages.c:42
 msgid "next screen"
 msgstr "layar selanjutnya"
 
-#: LYMessages.c:48
+#: LYMessages.c:43
 msgid "HELP!"
 msgstr "TOLONG!"
 
-#: LYMessages.c:49
+#: LYMessages.c:44
 msgid ", help on "
 msgstr ", bantuan di "
 
 #. #define HELP
-#: LYMessages.c:51
+#: LYMessages.c:46
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Perintah: Gunakan tombol panah untuk berpindah, '?' untuk bantuan, 'q' untuk berhenti, '<-' untuk kembali."
 
 #. #define MOREHELP
-#: LYMessages.c:53
+#: LYMessages.c:48
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- tekan spasi untuk lebih lanjut, gunakan tombol panah untuk berpindah, '?' untuk bantuan, 'q' untuk berhenti."
 
-#: LYMessages.c:54
+#: LYMessages.c:49
 msgid "-- press space for next page --"
 msgstr "-- tekan spasi untuk halaman selanjutnya --"
 
-#: LYMessages.c:55
+#: LYMessages.c:50
 msgid "URL too long"
 msgstr "URL terlalu panjang"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:61
+#: LYMessages.c:56
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Bagian masukan teks) Tidak aktif. Tekan <return> mengaktivasi."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:63
+#: LYMessages.c:58
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Daerah teks) Tidak aktif. Tekan <return> untuk mengaktivasi."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:65
+#: LYMessages.c:60
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Daerah teks) Tidak aktif. Tekan <return> untuk mengaktivasi (%s untuk pengubah)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:67
+#: LYMessages.c:62
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Bagian formulir) Tidak aktif. Gunakan <return> untuk mengubah."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:69
+#: LYMessages.c:64
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Bagian formulir) Tidak aktif. Gunakan <return> untuk mengubah (%s untuk mengirim dengan tidak ada cache)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:71
+#: LYMessages.c:66
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Bagian formulir) Tidak aktif. Tekan <return> untuk mengubah, tekan <return> dua kali untuk mengirimkan."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:73
+#: LYMessages.c:68
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(bagian formulir mailto) Tidak aktif. Tekan <return> untuk mengubah."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:75
+#: LYMessages.c:70
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Bagian masukan sandi lewat) Tidak aktif. Tekan <return> untuk mengaktivasi."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:78
+#: LYMessages.c:73
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Bagian masukan berkas UNMODIFIABLE. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:80
+#: LYMessages.c:75
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Bagian masukan berkas) Masukan nama berkas. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:82
+#: LYMessages.c:77
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Bagian masukan teks) Masukan teks. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:84
+#: LYMessages.c:79
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Daerah teks) Masukan teks. Gunakan panah NAIK/TURUN atau TAB untuk move off."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:86
+#: LYMessages.c:81
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Daerah teks) Masukan teks. Gunakan panah NAIK/TURUN atau TAB untuk move off (%s untuk pengubah)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:88
+#: LYMessages.c:83
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Daerah formulir teks UNMODIFIABLE. Gunakan NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:90
+#: LYMessages.c:85
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Daerah formulir) Masukan teks. Gunakan <return> untuk mengirimkan."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:92
+#: LYMessages.c:87
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Daerah formulir) Masukan teks. Gunakan <return> untuk mengirimkan (%s untuk tidak ada cache)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:94
+#: LYMessages.c:89
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Daerah formulir) Masukan teks. Gunakan <return> untuk mengirimkan, panah atau tabs untuk move off."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:96
+#: LYMessages.c:91
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "daerah formulir UNMODIFIABLE. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:98
+#: LYMessages.c:93
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(daerah formulir mailto) Masukan teks. Gunakan <return> untuk mengirimkan, panah untuk move off."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:100
+#: LYMessages.c:95
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(daerah formulir mailto) Surat dilarang jadi anda tidak dapat mengirimkan."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:102
+#: LYMessages.c:97
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Daerah masukan sandi lewat) Masukan teks. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:104
+#: LYMessages.c:99
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "formulir sandi lewat UNMODIFIABLE. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:106
+#: LYMessages.c:101
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Daerah checkbox)  Gunakan panah-kanan atau <return> untuk mengubah."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:108
+#: LYMessages.c:103
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "formulir checkbox UNMODIFIABLE. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:110
+#: LYMessages.c:105
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Tombol radio)   Gunakan panah-kanan atau <return> untuk mengubah."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:112
+#: LYMessages.c:107
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "tombol formulir radio UNMODIFIABLE. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:114
+#: LYMessages.c:109
 msgid "Submit ('x' for no cache) to "
 msgstr "Kirim ('x' untuk tanpa cache) ke "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:116
+#: LYMessages.c:111
 msgid "Submit to "
 msgstr "Kirim ke "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:118
+#: LYMessages.c:113
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Tombol kirim formulir) Gunakan panah-kanan atau <kembali> untuk mengirimkan ('x' untuk tanpa cache)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:120
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Tombol kirim formulir) Gunakan panah-kanan atau <return> untuk mengirimkan."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:122
+#: LYMessages.c:117
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "tombol kirim formulir TIDAK AKTIF. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:124
+#: LYMessages.c:119
 msgid "Submit mailto form to "
 msgstr "Kirim formulir mailto ke "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:126
+#: LYMessages.c:121
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(tombol kirim formulir mailto) Gunakan panah-kanan atau <kembali> untuk mengirimkan."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:128
+#: LYMessages.c:123
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(tombol kirim formulir mailto) Surat dilarang jadi anda tidak dapat mengirimkan."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:130
+#: LYMessages.c:125
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Tombol reset formulir) Gunakan panah-kanan atau <return> untuk mereset formulir ke baku."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:132
+#: LYMessages.c:127
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "tombol reset formulir TIDAK AKTIF. Gunakan panah NAIK atau TURUN atau tab untuk move off."
 
+#. #define FORM_LINK_BUTTON_MESSAGE
+#: LYMessages.c:129
+msgid "(Script button)   Use UP or DOWN arrows or tab to move off."
+msgstr "tombol kirim formulir TIDAK AKTIF. Gunakan panah NAIK atau TURUN atau tab untuk move off."
+
+#. #define FORM_LINK_BUTTON_DIS_MSG
+#: LYMessages.c:131
+msgid "DISABLED Script button.  Use UP or DOWN arrows or tab to move off."
+msgstr "tombol kirim formulir TIDAK AKTIF. Gunakan panah NAIK atau TURUN atau tab untuk move off."
+
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:134
+#: LYMessages.c:133
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Daftar opsi) Tekan return dan gunakan tombol panah dan return untuk memilih opsi."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:136
+#: LYMessages.c:135
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(Daftar pilihan) Tekan return dan gunakan tombol panah dan return untuk memilih opsi."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:138
+#: LYMessages.c:137
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "daftar opsi TIDAK DAPAT DIMODIFIKASI. Gunakan return atau tombol panah untuk mengulas atau tinggalkan."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:140
+#: LYMessages.c:139
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "daftar pilihan TIDAK DAPAT DIMODIFIKASI. Gunakan return atau tombol panah untuk mengulas atau tinggalkan."
 
-#: LYMessages.c:141
+#: LYMessages.c:140
 msgid "Submitting form..."
 msgstr "Mengirimkan formulir..."
 
-#: LYMessages.c:142
+#: LYMessages.c:141
 msgid "Resetting form..."
 msgstr "Mereset formulir..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:144
+#: LYMessages.c:143
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Memuat kembali dokumen. Masukan formulir apapun akan hilang!"
 
+#. #define LINK_NOT_IN_FORM
 #: LYMessages.c:145
+msgid "The current link is not in a FORM"
+msgstr "The current link is not in a FORM"
+
+#: LYMessages.c:146
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Peringatan: Tidak dapat transcode formulir data ke set karakter %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:148
+#: LYMessages.c:149
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(LINK NORMAL)   Gunakan panah-kanan atau <return> untuk mengaktivasi."
 
-#: LYMessages.c:149
+#: LYMessages.c:150
 msgid "The resource requested is not available at this time."
 msgstr "Sumber daya yang diminta tidak tersedia saat ini."
 
-#: LYMessages.c:150
+#: LYMessages.c:151
 msgid "Enter Lynx keystroke command: "
 msgstr "Masukan perintah tombol singkat Lynx: "
 
-#: LYMessages.c:151
+#: LYMessages.c:152
 msgid "Looking up "
 msgstr "Mencari "
 
-#: LYMessages.c:152
+#: LYMessages.c:153
 #, c-format
 msgid "Getting %s"
 msgstr "Mendapatkan %s"
 
-#: LYMessages.c:153
+#: LYMessages.c:154
 #, c-format
 msgid "Skipping %s"
 msgstr "Melewatkan %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:155
 #, c-format
 msgid "Using %s"
 msgstr "Menggunakan %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:156
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "URL Tidak legal: %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:157
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Alamat %s terbentuk buruk"
 
-#: LYMessages.c:157
+#: LYMessages.c:158
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:158
+#: LYMessages.c:159
 msgid "Unable to access WWW file!!!"
 msgstr "Tidak dapat mengakses berkas WWW!!!"
 
-#: LYMessages.c:159
+#: LYMessages.c:160
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Ini adalah sebuah indeks yang dapat dicari. Gunakan %s untuk mencari"
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:161
+#: LYMessages.c:162
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Lebih-- Ini adalah sebuah indeks yang dapat dicari. Gunakan %s untuk mencari."
 
-#: LYMessages.c:162
+#: LYMessages.c:163
 msgid "You have entered an invalid link number."
 msgstr "Anda telah memasukan sebuah nomor link tidak valid."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:164
+#: LYMessages.c:165
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Saat ini melihat sumber dokumen. Tekan '\\' untuk kembali ke versi biasa."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:166
+#: LYMessages.c:167
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "  Tombol panah: Naik dan Turun untuk bergerak. Kanan untuk mengikuti sebuah sambungan. Kiri untuk kembali.\n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:168
+#: LYMessages.c:169
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr "H)elp O)ptions P)rint G)o M)ain layar Q)uit /=cari [delete]=daftar sejarah \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:170
+#: LYMessages.c:171
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain layar   o)psi     Q)quit \n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:172
+#: LYMessages.c:173
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "  O)ther cmds  B)lack E)dit  D)downlod ^R)eload ^W)ipe layar   cari doc: / \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:174
+#: LYMessages.c:175
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O)ther cmds C)omment Sejarah: <backspace> Bookmarks: V)iew, A)dd, R)emove\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:176
+#: LYMessages.c:177
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "            Masukan teks kedalah daerah dengan mengetikannya di papan ketik  "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:178
+#: LYMessages.c:179
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "    Ctrl-U untuk menghapus seluruh teks dalam daerah, [Backspace] untuk menghapus sebuah karakter "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:180
+#: LYMessages.c:181
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "      Ctrl-U untuk menghapus teks dalam daerah, [Backspace] untuk menghapus sebuah karakter "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:182
+#: LYMessages.c:183
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "    %s untuk menghapus seluruh teks dalam daerah, [Backspace] untuk menghapus sebuah karakter   "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:184
+#: LYMessages.c:185
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "      %s untuk menghapus teks dalam daerah, [Backspace] untuk menghapus sebuah karakter  "
 
 #. mailto
-#: LYMessages.c:187
+#: LYMessages.c:188
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Pengiriman formulir mailto salah bentuk! Dibatalkan!"
 
-#: LYMessages.c:188
+#: LYMessages.c:189
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Peringatan! Kode kontrol dalam alamat surat digantikan oleh ?"
 
-#: LYMessages.c:189
+#: LYMessages.c:190
 msgid "Mail disallowed!  Cannot submit."
 msgstr "Surat dilarang!   Tidak dapat mengirimkan."
 
-#: LYMessages.c:190
+#: LYMessages.c:191
 msgid "Mailto form submission failed!"
 msgstr "Formulir pengiriman mailto gagal!"
 
-#: LYMessages.c:191
+#: LYMessages.c:192
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Formulir pengiriman mailto dibatalkan!!!"
 
-#: LYMessages.c:192
+#: LYMessages.c:193
 msgid "Sending form content..."
 msgstr "Mengirimkan isi formulir..."
 
-#: LYMessages.c:193
+#: LYMessages.c:194
 msgid "No email address is present in mailto URL!"
 msgstr "Tidak ada alamat email yang ada dalam URL mailto!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:195
+#: LYMessages.c:196
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Tidak dapat membuka berkas sementara untuk URL mailto!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:197
+#: LYMessages.c:198
 msgid "Do you wish to include the original message?"
 msgstr "Anda ingin memasukan pesan asli?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:199
+#: LYMessages.c:200
 msgid "Do you wish to include the preparsed source?"
 msgstr "Anda ingin memasukan sumber yang sudah diparse?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:201
+#: LYMessages.c:202
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Spawning pengubah yang anda pilih untuk mengubah pesan surat"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:203
+#: LYMessages.c:204
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "Error mengubah spawning, periksa definisi pengubah anda dalam opsi menu"
 
-#: LYMessages.c:204
+#: LYMessages.c:205
 msgid "Send this comment?"
 msgstr "Kirim komentar ini?"
 
-#: LYMessages.c:205
+#: LYMessages.c:206
 msgid "Send this message?"
 msgstr "Kirim pesan ini?"
 
-#: LYMessages.c:206
+#: LYMessages.c:207
 msgid "Sending your message..."
 msgstr "Mengirimkan pesan anda..."
 
-#: LYMessages.c:207
+#: LYMessages.c:208
 msgid "Sending your comment:"
 msgstr "Mengirimkan komentar anda:"
 
 #. textarea
-#: LYMessages.c:210
+#: LYMessages.c:211
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Tidak dalam sebuah TEXTAREA; tidak dapat menggunakan pengubah eksternal."
 
-#: LYMessages.c:211
+#: LYMessages.c:212
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Tidak dalam sebuah TEKSAREA. tidak dapat menggunakan perintah."
 
-#: LYMessages.c:213
+#: LYMessages.c:214
 msgid "file: ACTIONs are disallowed!"
 msgstr "berkas: AKSI dilarang!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:216
 msgid "file: URLs via served links are disallowed!"
 msgstr "berkas: URL melalui sambungan yang dilayani dilarang!"
 
-#: LYMessages.c:216
+#: LYMessages.c:217
 msgid "Access to local files denied."
 msgstr "Akses ke berkas lokal ditolak."
 
-#: LYMessages.c:217
+#: LYMessages.c:218
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "berkas: URL melalui bookmarks dilarang!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:220
 msgid "This special URL is not allowed in external documents!"
 msgstr "URL spesial ini dilarang dalam dokumen eksternal!"
 
-#: LYMessages.c:220
+#: LYMessages.c:221
 msgid "Press <return> to return to Lynx."
 msgstr "Tekan <return> untuk kembali ke Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:224
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "Spawning subproses DCL. Gunakan 'logout' untuk kembali ke Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:228
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Ketik EXIT untuk kembali ke Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:231
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Spawning ke shell baku. Gunakan 'exit' untuk kembali ke Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:234
 msgid "Spawning is currently disabled."
 msgstr "Spawning saat ini tidak aktif."
 
-#: LYMessages.c:234
+#: LYMessages.c:235
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Perintah 'd'ownload saat ini tidak aktif."
 
-#: LYMessages.c:235
+#: LYMessages.c:236
 msgid "You cannot download an input field."
 msgstr "Anda tidak dapat mengubah sebuah daerah masukan."
 
-#: LYMessages.c:236
+#: LYMessages.c:237
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Formulir memiliki sebuah aksi mailto! Tidak dapat mengunduh."
 
-#: LYMessages.c:237
+#: LYMessages.c:238
 msgid "You cannot download a mailto: link."
 msgstr "Anda tidak dapat mengunduh sebuah sambungan mailto:."
 
-#: LYMessages.c:238
+#: LYMessages.c:239
 msgid "You cannot download cookies."
 msgstr "Anda tidak dapat mengunduh cookies."
 
-#: LYMessages.c:239
+#: LYMessages.c:240
 msgid "You cannot download a printing option."
 msgstr "Anda tidak dapat mengunduh sebuah opsi pencetakan."
 
-#: LYMessages.c:240
+#: LYMessages.c:241
 msgid "You cannot download an upload option."
 msgstr "Anda tidak dapat mengunduh sebuah opsi upload."
 
-#: LYMessages.c:241
+#: LYMessages.c:242
 msgid "You cannot download an permit option."
 msgstr "Anda tidak dapat mengunduh sebuah opsi ijin."
 
-#: LYMessages.c:242
+#: LYMessages.c:243
 msgid "This special URL cannot be downloaded!"
 msgstr "URL spesial ini tidak dapat diunduh!"
 
-#: LYMessages.c:243
+#: LYMessages.c:244
 msgid "Nothing to download."
 msgstr "Tidak ada yang akan diunduh."
 
-#: LYMessages.c:244
+#: LYMessages.c:245
 msgid "Trace ON!"
 msgstr "Jejak AKTIF!"
 
-#: LYMessages.c:245
+#: LYMessages.c:246
 msgid "Trace OFF!"
 msgstr "Jejak TIDAK AKTIF!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:248
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Sambungan tidak akan dimasukan untuk seluruh gambar! Memuat kembali..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:250
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Penanganan gambar baku dikembalikan! Memuat kembali..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:252
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "Pseudo_ALTs akan dimasukan untuk inlines tanpa string ALT! Memuat kembali..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:254
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Inlines tanpa sebuah string ALT dispesifikan akan diabaikan! Memuat kembali..."
 
-#: LYMessages.c:254
+#: LYMessages.c:255
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Mentah 8-bit atau mode CJK diubah TIDAK AKTIF! Memuat kembali..."
 
-#: LYMessages.c:255
+#: LYMessages.c:256
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Mentah 8-bit atau mode CJK diubah AKTIF! Memuat kembali..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:258
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Kirim permintaan HEAD untuk D)okumen atau L)ink, atau C)ancel? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:260
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Kirim permintaan HEAD untuk D)okumen, atau C)ancel? (d,c): "
 
-#: LYMessages.c:260
+#: LYMessages.c:261
 msgid "Sorry, the document is not an http URL."
 msgstr "Maaf, dokumen bukan sebuah URL http."
 
-#: LYMessages.c:261
+#: LYMessages.c:262
 msgid "Sorry, the link is not an http URL."
 msgstr "Maaf, sambungan bukan sebuah URL http."
 
-#: LYMessages.c:262
+#: LYMessages.c:263
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Maaf, AKSI untuk formulir ini tidak aktif."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:265
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "Maaf, AKSI untuk formulir ini bukan sebuah URL http."
 
-#: LYMessages.c:265
+#: LYMessages.c:266
 msgid "Not an http URL or form ACTION!"
 msgstr "Bukan sebuah URL http atau formulir AKSI!"
 
-#: LYMessages.c:266
+#: LYMessages.c:267
 msgid "This special URL cannot be a form ACTION!"
 msgstr "URL spesial ini tidak dapat berupa sebuah formulir AKSI!"
 
-#: LYMessages.c:267
+#: LYMessages.c:268
 msgid "URL is not in starting realm!"
 msgstr "URL tidak dalam realm starting!"
 
-#: LYMessages.c:268
+#: LYMessages.c:269
 msgid "News posting is disabled!"
 msgstr "Pengiriman berita tidak aktif!"
 
-#: LYMessages.c:269
+#: LYMessages.c:270
 msgid "File management support is disabled!"
 msgstr "Dukungan manajemen berkas tidak aktif!"
 
-#: LYMessages.c:270
+#: LYMessages.c:271
 msgid "No jump file is currently available."
 msgstr "Tidak ada berkas lompat yang saat ini tersedia."
 
-#: LYMessages.c:271
+#: LYMessages.c:272
 msgid "Jump to (use '?' for list): "
 msgstr "Lompat ke (gunakan '?' untuk daftar): "
 
-#: LYMessages.c:272
+#: LYMessages.c:273
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Melompat ke sebuah shortcut URL dilarang!"
 
-#: LYMessages.c:273
+#: LYMessages.c:274
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "URL random dilarang! Gunakan sebuah shortcut."
 
-#: LYMessages.c:274
+#: LYMessages.c:275
 msgid "No random URLs have been used thus far."
 msgstr "Tidak ada URL random yang telah digunakan sampai saat ini."
 
-#: LYMessages.c:275
+#: LYMessages.c:276
 msgid "Bookmark features are currently disabled."
 msgstr "Features bookmark saat ini tidak aktif."
 
-#: LYMessages.c:276
+#: LYMessages.c:277
 msgid "Execution via bookmarks is disabled."
 msgstr "Eksekusi melalui bookmarks tidak aktif."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:279
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Berkas bookmark tidak didefinisikan. Gunakan %s untuk melihat opsi."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:281
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Tidak dapat membuka berkas sementara untuk konversi hotlist X Mosaic."
 
-#: LYMessages.c:281
+#: LYMessages.c:282
 msgid "ERROR - unable to open bookmark file."
 msgstr "ERROR - tidak dapat membuka berkas bookmark."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:284
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Tidak dapat membuka berkas bookmark untuk penghapusan sebuah link."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:286
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Tidak dapat membuka berkas scratch untuk penghapusan sebuah sambungan."
 
-#: LYMessages.c:287
+#: LYMessages.c:288
 msgid "Error renaming scratch file."
 msgstr "Error mengubah nama berkas scratch."
 
-#: LYMessages.c:289
+#: LYMessages.c:290
 msgid "Error renaming temporary file."
 msgstr "Error mengubah nama berkas sementara."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:292
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Tidak dapat menyalin berkas sementara untuk penghapusan dari sambungan."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:294
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Tidak dapat membuka kembali berkas sementara untuk penghapusan dari link."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:297
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Sambungan bukan dengan dirinya sendiri seluruh di satu baris di berkas bookmark."
 
-#: LYMessages.c:297
+#: LYMessages.c:298
 msgid "Bookmark deletion failed."
 msgstr "Penghapusan bookmark gagal."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:300
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Berkas bookmark tidak dapat di traversed (hanya URL http)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:302
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Tidak dapat membuka berkas bookmark, gunakan 'a' untuk menyimpan sebuah link pertama"
 
-#: LYMessages.c:302
+#: LYMessages.c:303
 msgid "There are no links in this bookmark file!"
 msgstr "Tidak ada link di berkas bookmark ini!"
 
 #. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:305
 msgid "D)elete cached document or C)ancel? (d,c): "
 msgstr "D)elete cached dokumen atau C)ancel? (d,c): "
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:306
+#: LYMessages.c:307
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Simpan D)okumen atau L)ink untuk berkas bookmark atau C)ancel? (d,l,c): "
 
-#: LYMessages.c:307
+#: LYMessages.c:308
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Simpan D)okumen ke berkas bookmark atau C)ancel? (d,c): "
 
-#: LYMessages.c:308
+#: LYMessages.c:309
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Simpan L)ink ke berkas bookmark atau C)ancel? (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:310
+#: LYMessages.c:311
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Dokumen dari formulir dengan isi POST tidak dapat disimpan sebagai bookmarks."
 
-#: LYMessages.c:311
+#: LYMessages.c:312
 msgid "Cannot save form fields/links"
 msgstr "Tidak dapat menyimpan sambungan/daerah formulir"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:313
+#: LYMessages.c:314
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Sejarah, showinfo, menu dan daftar berkas tidak dapat disimpan sebagai bookmarks."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:315
+#: LYMessages.c:316
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Apakah anda benar benar ingin menghapus sambungan ini dari berkas bookmark anda?"
 
-#: LYMessages.c:316
+#: LYMessages.c:317
 msgid "Malformed address."
 msgstr "Alamat salah bentuk."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:318
+#: LYMessages.c:319
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Komentar sejarah parsing AKTIF (Minimal adalah overridden)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:320
+#: LYMessages.c:321
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Komentar historical parsing OFF (Minimal adalah dalam efek)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:322
+#: LYMessages.c:323
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Komentar historical parsing AKTIF (Valid overridden)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:324
+#: LYMessages.c:325
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Historical komentar parsing TIDAK AKTIF (Valid berada dalam efek)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:326
+#: LYMessages.c:327
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Komentar minimal parsing AKTIF (dan dalam efek)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:328
+#: LYMessages.c:329
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Komentar minimal parsing TIDAK AKTIF (Valid adalah dalam efek)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:330
+#: LYMessages.c:331
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Komentar minimal parsing AKTIF (tetapi Historical berada dalam efek)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:332
+#: LYMessages.c:333
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Komentar minimal parsing TIDAK AKTIF (Historical berada dalam efek)!"
 
-#: LYMessages.c:333
+#: LYMessages.c:334
 msgid "Soft double-quote parsing ON!"
 msgstr "Soft double-quote parsing AKTIF!"
 
-#: LYMessages.c:334
+#: LYMessages.c:335
 msgid "Soft double-quote parsing OFF!"
 msgstr "Soft double-quote parsing TIDAK AKTIF!"
 
-#: LYMessages.c:335
+#: LYMessages.c:336
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Sekarang menggunakan TagSoup parsing dari HTML."
 
-#: LYMessages.c:336
+#: LYMessages.c:337
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Sekarang menggunakan SortaSGML parsing dari HTML!"
 
-#: LYMessages.c:337
+#: LYMessages.c:338
 msgid "You are already at the end of this document."
 msgstr "Anda telah berada di akhir dari dokumen ini."
 
-#: LYMessages.c:338
+#: LYMessages.c:339
 msgid "You are already at the beginning of this document."
 msgstr "Anda telah berada diawal dari dokumen ini."
 
-#: LYMessages.c:339
+#: LYMessages.c:340
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Anda telah berada di halaman %d dari dokumen ini."
 
-#: LYMessages.c:340
+#: LYMessages.c:341
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Sambungan nomor %d telah baru."
 
-#: LYMessages.c:341
+#: LYMessages.c:342
 msgid "You are already at the first document"
 msgstr "Anda telah berada di awal dokumen"
 
-#: LYMessages.c:342
+#: LYMessages.c:343
 msgid "There are no links above this line of the document."
 msgstr "Tidak ada sambungan diatas baris ini dari dokumen."
 
-#: LYMessages.c:343
+#: LYMessages.c:344
 msgid "There are no links below this line of the document."
 msgstr "Tidak ada sambungan dibawah baris ini dari dokumen."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:345
+#: LYMessages.c:346
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Panjang maksimal dicapai! Hapus teks atau move off field."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:347
+#: LYMessages.c:348
 msgid "You are not on a form submission button or normal link."
 msgstr "Anda tidak berada di tombol pengiriman formulir atau sambungan normal."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:349
+#: LYMessages.c:350
 msgid "One radio button must be checked at all times!"
 msgstr "Satu tombol radio harus dicentang di setiap saat!"
 
-#: LYMessages.c:350
+#: LYMessages.c:351
 msgid "No submit button for this form, submit single text field?"
 msgstr "Tidak ada tombol kirim untuk formulir ini, kirim sebuah field teks tunggal?"
 
-#: LYMessages.c:351
+#: LYMessages.c:352
 msgid "Do you want to go back to the previous document?"
 msgstr "Apakah anda ingin kembali ke dokumen sebelumnya?"
 
-#: LYMessages.c:352
+#: LYMessages.c:353
 msgid "Use arrows or tab to move off of field."
 msgstr "Gunakan panah atau tab untuk move off dari field."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:354
+#: LYMessages.c:355
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Masukan teks. Gunakan panah atau tab untuk move off dari field."
 
-#: LYMessages.c:355
+#: LYMessages.c:356
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** HTML buruk!! Tidak ada formulir aksi yang didefinisikan.**"
 
-#: LYMessages.c:356
+#: LYMessages.c:357
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "HTML buruk!! Tidak dapat membuat jendela popup!"
 
-#: LYMessages.c:357
+#: LYMessages.c:358
 msgid "Unable to create popup window!"
 msgstr "Tidak dapat membuat jendela popup!"
 
-#: LYMessages.c:358
+#: LYMessages.c:359
 msgid "Goto a random URL is disallowed!"
 msgstr "Pergi ke URL random tidak diijinkan!"
 
-#: LYMessages.c:359
+#: LYMessages.c:360
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Pergi ke sebuah URL bukan http tidak diijinkan!"
 
-#: LYMessages.c:360
+#: LYMessages.c:361
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Anda tidak diijinkan untuk pergi ke URL \"%s\""
 
-#: LYMessages.c:361
+#: LYMessages.c:362
 msgid "URL to open: "
 msgstr "URL untuk dibuka: "
 
-#: LYMessages.c:362
+#: LYMessages.c:363
 msgid "Edit the current Goto URL: "
 msgstr "Ubah URL Goto sekarang: "
 
-#: LYMessages.c:363
+#: LYMessages.c:364
 msgid "Edit the previous Goto URL: "
 msgstr "Ubah URL Goto sebelumnya: "
 
-#: LYMessages.c:364
+#: LYMessages.c:365
 msgid "Edit a previous Goto URL: "
 msgstr "Ubah sebuah URL Goto sebelumnya: "
 
-#: LYMessages.c:365
+#: LYMessages.c:366
 msgid "Current document has POST data."
 msgstr "Dokumen sekarang memiliki data POST."
 
-#: LYMessages.c:366
+#: LYMessages.c:367
 msgid "Edit this document's URL: "
 msgstr "Ubah URL dokumen ini: "
 
-#: LYMessages.c:367
+#: LYMessages.c:368
 msgid "Edit the current link's URL: "
 msgstr "Ubah sambungan URL sekarang: "
 
-#: LYMessages.c:368
+#: LYMessages.c:369
+msgid "Edit the form's submit-URL: "
+msgstr "Ubah URL dokumen ini: "
+
+#: LYMessages.c:370
 msgid "You cannot edit File Management URLs"
 msgstr "Anda tidak dapat mengubah URL Manajemen Berkas"
 
-#: LYMessages.c:369
+#: LYMessages.c:371
 msgid "Enter a database query: "
 msgstr "Masukan sebuah permintaan basis data: "
 
-#: LYMessages.c:370
+#: LYMessages.c:372
 msgid "Enter a whereis query: "
 msgstr "Masukan sebuah permintaan whereis: "
 
-#: LYMessages.c:371
+#: LYMessages.c:373
 msgid "Edit the current query: "
 msgstr "Ubah permintaan sekarang: "
 
-#: LYMessages.c:372
+#: LYMessages.c:374
 msgid "Edit the previous query: "
 msgstr "Ubah permintaan sebelumnya: "
 
-#: LYMessages.c:373
+#: LYMessages.c:375
 msgid "Edit a previous query: "
 msgstr "Ubah permintaan sebelumnya: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:375
+#: LYMessages.c:377
 msgid "Use Control-R to resubmit the current query."
 msgstr "Gunakan Ctrl-R untuk mengirim kembali permintaan sekarang."
 
-#: LYMessages.c:376
+#: LYMessages.c:378
 msgid "Edit the current shortcut: "
 msgstr "Ubah tombol singkat sekarang: "
 
-#: LYMessages.c:377
+#: LYMessages.c:379
 msgid "Edit the previous shortcut: "
 msgstr "Ubah tombol singkat sebelumnya: "
 
-#: LYMessages.c:378
+#: LYMessages.c:380
 msgid "Edit a previous shortcut: "
 msgstr "Ubah sebuah tombol singkat sebelumnya: "
 
-#: LYMessages.c:379
+#: LYMessages.c:381
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Tombol '%c' tidak dipetakan ke sebuah berkas lompat!"
 
-#: LYMessages.c:380
+#: LYMessages.c:382
 msgid "Cannot locate jump file!"
 msgstr "Tidak dapat menemukan berkas lompat!"
 
-#: LYMessages.c:381
+#: LYMessages.c:383
 msgid "Cannot open jump file!"
 msgstr "Tidak dapat membuka berkas lompat!"
 
-#: LYMessages.c:382
+#: LYMessages.c:384
 msgid "Error reading jump file!"
 msgstr "Error membaca berkas lompat!"
 
-#: LYMessages.c:383
+#: LYMessages.c:385
 msgid "Out of memory reading jump file!"
 msgstr "Kehabisan memori membaca berkas lompat!"
 
-#: LYMessages.c:384
+#: LYMessages.c:386
 msgid "Out of memory reading jump table!"
 msgstr "Kehabisan memori membaca tabel lompat!"
 
-#: LYMessages.c:385
+#: LYMessages.c:387
 msgid "No index is currently available."
 msgstr "Tidak ada indeks yang saat ini tersedia."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:387
+#: LYMessages.c:389
 msgid "Do you really want to go to the Main screen?"
 msgstr "Apakah anda benar benar ingin pergi ke layar Utama?"
 
-#: LYMessages.c:388
+#: LYMessages.c:390
 msgid "You are already at main screen!"
 msgstr "Anda telah berada dilayar utama!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:390
+#: LYMessages.c:392
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Bukan sebuah dokumen terindeks yang dapat dicari -- tekan '/' untuk mencari untuk sebuah string teks"
 
 #. #define NO_OWNER
-#: LYMessages.c:392
+#: LYMessages.c:394
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Tidak ada pemilik didefinisikan untuk berkas ini jadi anda tidak dapat mengirim sebuah komentar"
 
-#: LYMessages.c:393
+#: LYMessages.c:395
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Tidak ada pemilik yang didefinisikan. Gunakan %s?"
 
-#: LYMessages.c:394
+#: LYMessages.c:396
 msgid "Do you wish to send a comment?"
 msgstr "Apakah anda ingin mengirim sebuah komentar?"
 
-#: LYMessages.c:395
+#: LYMessages.c:397
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "Surat tidak diijinkan jadi anda tidak dapat mengirim sebuah komentar"
 
-#: LYMessages.c:396
+#: LYMessages.c:398
 msgid "The 'e'dit command is currently disabled."
 msgstr "Perintah 'e' saat ini tidak aktif."
 
-#: LYMessages.c:397
+#: LYMessages.c:399
 msgid "External editing is currently disabled."
 msgstr "Pengubahan eksternal saat ini tidak aktif."
 
-#: LYMessages.c:398
+#: LYMessages.c:400
 msgid "System error - failure to get status."
 msgstr "Sistem error - gagal untuk memperoleh status."
 
-#: LYMessages.c:399
+#: LYMessages.c:401
 msgid "No editor is defined!"
 msgstr "Tidak ada pengubah yang didefinisikan!"
 
-#: LYMessages.c:400
+#: LYMessages.c:402
 msgid "The 'p'rint command is currently disabled."
 msgstr "Perintah 'p' saat ini tidak aktif."
 
-#: LYMessages.c:401
+#: LYMessages.c:403
 msgid "Document has no Toolbar links or Banner."
 msgstr "Dokumen tidak memiliki sebuah sambungan Toolbar atau Banner."
 
-#: LYMessages.c:402
+#: LYMessages.c:404
 msgid "Unable to open traversal file."
 msgstr "Tidak dapat membuka sebuah berkas traversal."
 
-#: LYMessages.c:403
+#: LYMessages.c:405
 msgid "Unable to open traversal found file."
 msgstr "Tidak dapat membuka berkas traversal yang ditemukan."
 
-#: LYMessages.c:404
+#: LYMessages.c:406
 msgid "Unable to open reject file."
 msgstr "Tidak dapat membuka sebuah berkas reject."
 
-#: LYMessages.c:405
+#: LYMessages.c:407
 msgid "Unable to open traversal errors output file"
 msgstr "Tidak dapat membuka traversal errors berkas keluaran"
 
-#: LYMessages.c:406
+#: LYMessages.c:408
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "TRAVERSAL TELAH DIINTERUPSI"
 
-#: LYMessages.c:407
+#: LYMessages.c:409
 msgid "Follow link (or goto link or page) number: "
 msgstr "Ikuti sambungan (atau pergi link atau halaman) nomor: "
 
-#: LYMessages.c:408
+#: LYMessages.c:410
 msgid "Select option (or page) number: "
 msgstr "Pilih opsi (atau halaman) nomor: "
 
-#: LYMessages.c:409
+#: LYMessages.c:411
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Opsi nomor %d telah baru."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:411
+#: LYMessages.c:413
 msgid "You are already at the end of this option list."
 msgstr "Anda telah berada di akhir dari daftar opsi ini."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:413
+#: LYMessages.c:415
 msgid "You are already at the beginning of this option list."
 msgstr "Anda telah berada di awal dari daftar opsi ini."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:415
+#: LYMessages.c:417
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Anda telah berada di halaman %d dari daftar opsi ini."
 
-#: LYMessages.c:416
+#: LYMessages.c:418
 msgid "You have entered an invalid option number."
 msgstr "Anda telah memasukan sebuah nomor opsi tidak valid."
 
-#: LYMessages.c:417
+#: LYMessages.c:419
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** HTML buruk!! Gunakan -trace untuk mendiagnosa. **"
 
-#: LYMessages.c:418
+#: LYMessages.c:420
 msgid "Give name of file to save in"
 msgstr "Berikan nama dari berkas untuk menyimpan"
 
-#: LYMessages.c:419
+#: LYMessages.c:421
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Tidak dapat menyimpan data ke berkas -- mohon jalankan WWW secara lokal"
 
-#: LYMessages.c:420
+#: LYMessages.c:422
 msgid "Can't open temporary file!"
 msgstr "Tidak dapat membuka berkas sementara!"
 
-#: LYMessages.c:421
+#: LYMessages.c:423
 msgid "Can't open output file!  Cancelling!"
 msgstr "Tidak dapat membuka berkas! Membatalkan!"
 
-#: LYMessages.c:422
+#: LYMessages.c:424
 msgid "Execution is disabled."
 msgstr "Eksekusi tidak aktif."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:424
+#: LYMessages.c:426
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Eksekusi tidak aktif untuk berkas ini. Lihat menu Opsi (gunakan %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:426
+#: LYMessages.c:428
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Kapabilitas eksekusi tidak dikompile kedalam versi ini."
 
-#: LYMessages.c:427
+#: LYMessages.c:429
 msgid "This file cannot be displayed on this terminal."
 msgstr "Berkas ini tidak dapat ditampilkan di terminal ini."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:429
+#: LYMessages.c:431
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Berkas ini tidak dapat ditampilkan di terminal ini: D)ownload, atau C)cancel"
 
-#: LYMessages.c:430
+#: LYMessages.c:432
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D)ownload, atau C)ancel"
 
-#: LYMessages.c:431
+#: LYMessages.c:433
 msgid "Cancelling file."
 msgstr "Membatalkan berkas."
 
-#: LYMessages.c:432
+#: LYMessages.c:434
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Mendapatkan berkas. - MOHON TUNGGU -"
 
-#: LYMessages.c:433
+#: LYMessages.c:435
 msgid "Enter a filename: "
 msgstr "Masukan sebuah nama berkas: "
 
-#: LYMessages.c:434
+#: LYMessages.c:436
 msgid "Edit the previous filename: "
 msgstr "Ubah nama berkas sebelumnya: "
 
-#: LYMessages.c:435
+#: LYMessages.c:437
 msgid "Edit a previous filename: "
 msgstr "Ubah nama berkas sebelumnya: "
 
-#: LYMessages.c:436
+#: LYMessages.c:438
 msgid "Enter a new filename: "
 msgstr "Masukan sebuah nama berkas baru: "
 
-#: LYMessages.c:437
+#: LYMessages.c:439
 msgid "File name may not begin with a dot."
 msgstr "Nama berkas tidak boleh dimulai dengan sebuah dot."
 
-#: LYMessages.c:439
+#: LYMessages.c:441
 msgid "File exists.  Create higher version?"
 msgstr "Berkas ada. Buat sebuah versi lebih tinggi?"
 
-#: LYMessages.c:441
+#: LYMessages.c:443
 msgid "File exists.  Overwrite?"
 msgstr "Berkas ada. Paksa tulis?"
 
-#: LYMessages.c:443
+#: LYMessages.c:445
 msgid "Cannot write to file."
 msgstr "Tidak dapat menulis ke berkas."
 
-#: LYMessages.c:444
+#: LYMessages.c:446
 msgid "ERROR! - download command is misconfigured."
 msgstr "ERROR! - perintah unduh salah konfigurasi."
 
-#: LYMessages.c:445
+#: LYMessages.c:447
 msgid "Unable to download file."
 msgstr "Tidak dapat mengunduh berkas."
 
-#: LYMessages.c:446
+#: LYMessages.c:448
 msgid "Reading directory..."
 msgstr "Membaca direktori..."
 
-#: LYMessages.c:447
+#: LYMessages.c:449
 msgid "Building directory listing..."
 msgstr "Membuat daftar direktori..."
 
-#: LYMessages.c:448
+#: LYMessages.c:450
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: LYMessages.c:449
+#: LYMessages.c:451
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Tidak dapat mengubah berkas '%s'."
 
-#: LYMessages.c:450
+#: LYMessages.c:452
 msgid "Unable to access document!"
 msgstr "Tidak dapat mengakses dokumen!"
 
-#: LYMessages.c:451
+#: LYMessages.c:453
 msgid "Could not access file."
 msgstr "Tidak dapat mengakses berkas."
 
-#: LYMessages.c:452
+#: LYMessages.c:454
 msgid "Could not access directory."
 msgstr "Tidak dapat mengakses direktori."
 
-#: LYMessages.c:453
+#: LYMessages.c:455
 msgid "Could not load data."
 msgstr "Tidak dapat memuat data."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:455
+#: LYMessages.c:457
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx tidak dapat saat ini (e)dit berkas WWW remote."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:457
+#: LYMessages.c:459
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Daerah ini tidak dapat (e)dited dengan sebuah pengubah eksternal."
 
-#: LYMessages.c:458
+#: LYMessages.c:460
 msgid "Bad rule"
 msgstr "Aturan buruk"
 
-#: LYMessages.c:459
+#: LYMessages.c:461
 msgid "Insufficient operands:"
 msgstr "Operan tidak mencukupi:"
 
-#: LYMessages.c:460
+#: LYMessages.c:462
 msgid "You are not authorized to edit this file."
 msgstr "Anda tidak diijinkan untuk mengubah berkas ini."
 
-#: LYMessages.c:461
+#: LYMessages.c:463
 msgid "Title: "
 msgstr "Judul: "
 
-#: LYMessages.c:462
+#: LYMessages.c:464
 msgid "Subject: "
 msgstr "Subjek: "
 
-#: LYMessages.c:463
+#: LYMessages.c:465
 msgid "Username: "
 msgstr "Nama pengguna: "
 
-#: LYMessages.c:464
+#: LYMessages.c:466
 msgid "Password: "
 msgstr "Sandi lewat: "
 
-#: LYMessages.c:465
+#: LYMessages.c:467
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Nama pengguna dan Sandi lewat dibutuhkan!!!"
 
-#: LYMessages.c:466
+#: LYMessages.c:468
 msgid "lynx: Password required!!!"
 msgstr "lynx: Sandi lewat dibutuhkan!!!"
 
-#: LYMessages.c:467
+#: LYMessages.c:469
 msgid "Clear all authorization info for this session?"
 msgstr "Hapus seluruh informasi otorisasi untuk sesi ini?"
 
-#: LYMessages.c:468
+#: LYMessages.c:470
 msgid "Authorization info cleared."
 msgstr "Informasi otorisasi dihapus."
 
-#: LYMessages.c:469
+#: LYMessages.c:471
 msgid "Authorization failed.  Retry?"
 msgstr "Otorisasi gagal. Coba lagi?"
 
-#: LYMessages.c:470
+#: LYMessages.c:472
 msgid "cgi support has been disabled."
 msgstr "dukungan cgi telah dinon-aktifkan."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:472
+#: LYMessages.c:474
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Kapabilitas lynxcgi tidak dikompile kedalam versi ini."
 
-#: LYMessages.c:473
+#: LYMessages.c:475
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Maaf, tidak ada cara yang dikenal untuk mengubah %s ke %s."
 
-#: LYMessages.c:474
+#: LYMessages.c:476
 msgid "Unable to set up connection."
 msgstr "Tidak dapat menset up koneksi."
 
-#: LYMessages.c:475
+#: LYMessages.c:477
 msgid "Unable to make connection"
 msgstr "Tidak dapat membuat koneksi"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:477
+#: LYMessages.c:479
 msgid "Executable link rejected due to malformed request."
 msgstr "Sambungan eksekusi ditolak karena permintaan salah bentuk."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:481
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Sambungan eksekusi ditolak karena karakter `%c'."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:483
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Sambungan eksekusi ditolak karena string jalur relatif ('../')."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:483
+#: LYMessages.c:485
 msgid "Executable link rejected due to location or path."
 msgstr "Sambungan eksekusi ditolak karena lokasi atau jalur."
 
-#: LYMessages.c:484
+#: LYMessages.c:486
 msgid "Mail access is disabled!"
 msgstr "Akses surat tidak aktif!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:486
+#: LYMessages.c:488
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Hanya berkas dan server di lokal host yang dapat diakses."
 
-#: LYMessages.c:487
+#: LYMessages.c:489
 msgid "Telnet access is disabled!"
 msgstr "Akses telnet tidak aktif!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:489
+#: LYMessages.c:491
 msgid "Telnet port specifications are disabled."
 msgstr "Spesifikasi telnet port tidak aktif."
 
-#: LYMessages.c:490
+#: LYMessages.c:492
 msgid "USENET news access is disabled!"
 msgstr "akses berita USENET tidak aktif!"
 
-#: LYMessages.c:491
+#: LYMessages.c:493
 msgid "Rlogin access is disabled!"
 msgstr "akses Rlogin tidak aktif!"
 
-#: LYMessages.c:492
+#: LYMessages.c:494
 msgid "Ftp access is disabled!"
 msgstr "akses ftp tidak aktif!"
 
-#: LYMessages.c:493
+#: LYMessages.c:495
 msgid "There are no references from this document."
 msgstr "Tidak ada referensi dari dokumen ini."
 
-#: LYMessages.c:494
+#: LYMessages.c:496
 msgid "There are only hidden links from this document."
 msgstr "Hanya sambungan tersembunyi dari dokumen ini."
 
-#: LYMessages.c:496
+#: LYMessages.c:498
 msgid "Unable to open command file."
 msgstr "Tidak dapat membuka berkas perintah."
 
-#: LYMessages.c:498
+#: LYMessages.c:500
 msgid "News Post Cancelled!!!"
 msgstr "Pos Berita Dibatalkan!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:500
+#: LYMessages.c:502
 msgid "Spawning your selected editor to edit news message"
 msgstr "Spawning ke pengubah yang anda pilih untuk mengubah pesan berita"
 
-#: LYMessages.c:501
+#: LYMessages.c:503
 msgid "Post this message?"
 msgstr "Pos pesan ini?"
 
-#: LYMessages.c:502
+#: LYMessages.c:504
 #, c-format
 msgid "Append '%s'?"
 msgstr "Tambahkan '%s'?"
 
-#: LYMessages.c:503
+#: LYMessages.c:505
 msgid "Posting to newsgroup(s)..."
 msgstr "Posting ke newsgroup(s)..."
 
-#: LYMessages.c:505
+#: LYMessages.c:507
 msgid "*** You have unread mail. ***"
 msgstr "*** Anda memiliki surat tidak terbaca.***"
 
-#: LYMessages.c:507
+#: LYMessages.c:509
 msgid "*** You have mail. ***"
 msgstr "*** Anda memiliki surat. ***"
 
-#: LYMessages.c:509
+#: LYMessages.c:511
 msgid "*** You have new mail. ***"
 msgstr "*** Anda memiliki surat baru. ***"
 
-#: LYMessages.c:510
+#: LYMessages.c:512
 msgid "File insert cancelled!!!"
 msgstr "Pemasukan berkas dibatalkan!!!"
 
-#: LYMessages.c:511
+#: LYMessages.c:513
 msgid "Not enough memory for file!"
 msgstr "Tidak cukup memori untuk berkas!"
 
-#: LYMessages.c:512
+#: LYMessages.c:514
 msgid "Can't open file for reading."
 msgstr "Tidak dapat membuka berkas untuk pembacaan."
 
-#: LYMessages.c:513
+#: LYMessages.c:515
 msgid "File does not exist."
 msgstr "Berkas tidak ada."
 
-#: LYMessages.c:514
+#: LYMessages.c:516
 msgid "File does not exist - reenter or cancel:"
 msgstr "Berkas tidak ada - reenter atau batalkan:"
 
-#: LYMessages.c:515
+#: LYMessages.c:517
 msgid "File is not readable."
 msgstr "Berkas tidak dapat dibaca."
 
-#: LYMessages.c:516
+#: LYMessages.c:518
 msgid "File is not readable - reenter or cancel:"
 msgstr "Berkas tidak dapat dibaca - reenter atau batal:"
 
-#: LYMessages.c:517
+#: LYMessages.c:519
 msgid "Nothing to insert - file is 0-length."
 msgstr "Tidak ada untuk dimasukan - berkas panjang-0."
 
-#: LYMessages.c:518
+#: LYMessages.c:520
 msgid "Save request cancelled!!!"
 msgstr "Permintaan penyimpanan dibatalkan!!!"
 
-#: LYMessages.c:519
+#: LYMessages.c:521
 msgid "Mail request cancelled!!!"
 msgstr "Permintaan surat dibatalkan!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:521
+#: LYMessages.c:523
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Melihat preparsed sumber. Apakah anda yang anda ingin untuk mengirimnya?"
 
-#: LYMessages.c:522
+#: LYMessages.c:524
 msgid "Please wait..."
 msgstr "Mohon tunggu..."
 
-#: LYMessages.c:523
+#: LYMessages.c:525
 msgid "Mailing file.  Please wait..."
 msgstr "Mengirim surat berkas. Mohon tunggu..."
 
-#: LYMessages.c:524
+#: LYMessages.c:526
 msgid "ERROR - Unable to mail file"
 msgstr "ERROR - Tidak dapat mengirim surat berkas"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:526
+#: LYMessages.c:528
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Berkas %d panjang layar. Apakah anda yakin anda ingin untuk mencetaknya?"
 
-#: LYMessages.c:527
+#: LYMessages.c:529
 msgid "Print request cancelled!!!"
 msgstr "Permintaan pencetakan dibatalkan!!!"
 
-#: LYMessages.c:528
+#: LYMessages.c:530
 msgid "Press <return> to begin: "
 msgstr "Tekan <return> untuk memulai: "
 
-#: LYMessages.c:529
+#: LYMessages.c:531
 msgid "Press <return> to finish: "
 msgstr "Tekan <return> untuk selesai: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:531
+#: LYMessages.c:533
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Berkas memiliki %d halaman. Apakah anda yakin anda ingin untuk mencetaknya?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:533
+#: LYMessages.c:535
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Yakinkan pencetak anda sudah nyala. Tekan <return> untuk memulai pencetakan:"
 
-#: LYMessages.c:534
+#: LYMessages.c:536
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "ERROR - Tidak dapat mengalokasikan ruang berkas!!!"
 
-#: LYMessages.c:535
+#: LYMessages.c:537
 msgid "Unable to open tempfile"
 msgstr "Tidak dapat membuka berkas sementara"
 
-#: LYMessages.c:536
+#: LYMessages.c:538
 msgid "Unable to open print options file"
 msgstr "Tidak dapat membuka opsi cetak berkas"
 
-#: LYMessages.c:537
+#: LYMessages.c:539
 msgid "Printing file.  Please wait..."
 msgstr "Mencetak berkas. Mohon tunggu..."
 
-#: LYMessages.c:538
+#: LYMessages.c:540
 msgid "Please enter a valid internet mail address: "
 msgstr "Mohon masukan sebuah alamat internet surat yang valid: "
 
-#: LYMessages.c:539
+#: LYMessages.c:541
 msgid "ERROR! - printer is misconfigured!"
 msgstr "ERROR! - pencetak salah konfigurasi!"
 
-#: LYMessages.c:540
+#: LYMessages.c:542
 msgid "Image map from POST response not available!"
 msgstr "Peta gambar dari balasan POST tidak tersedia!"
 
-#: LYMessages.c:541
+#: LYMessages.c:543
 msgid "Misdirected client-side image MAP request!"
 msgstr "Salah arah permintaan sisi klien peta gambar!"
 
-#: LYMessages.c:542
+#: LYMessages.c:544
 msgid "Client-side image MAP is not accessible!"
 msgstr "Gambar PETA sisi klien tidak dapat diakses!"
 
-#: LYMessages.c:543
+#: LYMessages.c:545
 msgid "No client-side image MAPs are available!"
 msgstr "Tidak ada peta gambar sisi klien yang tersedia!"
 
-#: LYMessages.c:544
+#: LYMessages.c:546
 msgid "Client-side image MAP is not available!"
 msgstr "Gambar PETA sisi klien tidak tersedia!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:547
+#: LYMessages.c:549
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Tinggi layar harus paling tidak 24 baris untuk menu Opsi!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:549
+#: LYMessages.c:551
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Tinggi layar harus berada paling tidak 23 baris untuk menu Opsi!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:551
+#: LYMessages.c:553
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Tinggi layar harus berada paling tidak 22 baris untuk menu Opsi!"
 
-#: LYMessages.c:553
+#: LYMessages.c:555
 msgid "That key requires Advanced User mode."
 msgstr "Tombol itu membutuhkan mode Pengguna Expert."
 
-#: LYMessages.c:554
+#: LYMessages.c:556
 #, c-format
 msgid "Content-type: %s"
 msgstr "Tipe-isi: %s"
 
-#: LYMessages.c:555
+#: LYMessages.c:557
 msgid "Command: "
 msgstr "Perintah: "
 
-#: LYMessages.c:556
+#: LYMessages.c:558
 msgid "Unknown or ambiguous command"
 msgstr "Tidak diketahui atau perintah ambigu"
 
-#: LYMessages.c:557
+#: LYMessages.c:559
 msgid " Version "
 msgstr " Versi "
 
-#: LYMessages.c:558
+#: LYMessages.c:560
 msgid " first"
 msgstr " pertama"
 
-#: LYMessages.c:559
+#: LYMessages.c:561
 msgid ", guessing..."
 msgstr ", menebak..."
 
-#: LYMessages.c:560
+#: LYMessages.c:562
 msgid "Permissions for "
 msgstr "Ijin untuk "
 
-#: LYMessages.c:561
+#: LYMessages.c:563
 msgid "Select "
 msgstr "Pilih "
 
-#: LYMessages.c:562
+#: LYMessages.c:564
 msgid "capital letter"
 msgstr "huruf besar"
 
-#: LYMessages.c:563
+#: LYMessages.c:565
 msgid " of option line,"
 msgstr " dari baris opsi,"
 
-#: LYMessages.c:564
+#: LYMessages.c:566
 msgid " to save,"
 msgstr " untuk menyimpan,"
 
-#: LYMessages.c:565
+#: LYMessages.c:567
 msgid " to "
 msgstr " ke "
 
-#: LYMessages.c:566
+#: LYMessages.c:568
 msgid " or "
 msgstr " atau "
 
-#: LYMessages.c:567
+#: LYMessages.c:569
 msgid " index"
 msgstr " indeks"
 
-#: LYMessages.c:568
+#: LYMessages.c:570
 msgid " to return to Lynx."
 msgstr " untuk kembali ke Lynx."
 
-#: LYMessages.c:569
+#: LYMessages.c:571
 msgid "Accept Changes"
 msgstr "Terima Perubahan"
 
-#: LYMessages.c:570
+#: LYMessages.c:572
 msgid "Reset Changes"
 msgstr "Bakukan Perubahan"
 
-#: LYMessages.c:571
+#: LYMessages.c:573
 msgid "Left Arrow cancels changes"
 msgstr "Panah Kirim membatalkan perubahan"
 
-#: LYMessages.c:572
+#: LYMessages.c:574
 msgid "Save options to disk"
 msgstr "Simpan opsi ke disk"
 
-#: LYMessages.c:573
+#: LYMessages.c:575
 msgid "Hit RETURN to accept entered data."
 msgstr "Tekan RETURN untuk menerima data yang dimasukan."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:575
+#: LYMessages.c:577
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Tekan RETURN untuk menerima data yang dimasukan. Hapus data untuk memanggil baku."
 
-#: LYMessages.c:576
+#: LYMessages.c:578
 msgid "Value accepted!"
 msgstr "Nilai diterima!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:578
+#: LYMessages.c:580
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Nilai diterima! -- PERINGATAN: Lynx dikonfigurasikan untuk XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:580
+#: LYMessages.c:582
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Nilai diterima! -- PERINGATAN: Lynx TIDAK dikonfigurasikan untuk XWINDOWS!"
 
-#: LYMessages.c:581
+#: LYMessages.c:583
 msgid "You are not allowed to change which editor to use!"
 msgstr "Anda tidak diijinkan untuk mengubah pengubah mana untuk digunakan!"
 
-#: LYMessages.c:582
+#: LYMessages.c:584
 msgid "Failed to set DISPLAY variable!"
 msgstr "Gagal untuk menset variabel DISPLAY!"
 
-#: LYMessages.c:583
+#: LYMessages.c:585
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Gagal untuk menghapus variabel DISPLAY!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:585
+#: LYMessages.c:587
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Anda tidak diijinkan untuk mengubah berkas bookmark!"
 
-#: LYMessages.c:586
+#: LYMessages.c:588
 msgid "Terminal does not support color"
 msgstr "Terminal tidak mendukung warna"
 
-#: LYMessages.c:587
+#: LYMessages.c:589
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Terminal '%s' anda tidak mendukung warna."
 
-#: LYMessages.c:588
+#: LYMessages.c:590
 msgid "Access to dot files is disabled!"
 msgstr "Akses ke berkas titik tidak aktif!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:590
+#: LYMessages.c:592
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "String User-Agent tidak berisi \"Lynx\" atau \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:592
+#: LYMessages.c:594
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Gunakan \"L_y_n_x\" atau \"Lynx\" dalam User-Agent, atau ini tampak seperti penipuan sengaja!"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:594
+#: LYMessages.c:596
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "Perubahan dari string User-Agent tidak aktif!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:596
+#: LYMessages.c:598
 msgid "You are not allowed to change this setting."
 msgstr "Anda tidak diijinkan untuk mengubah konfigurasi ini."
 
-#: LYMessages.c:597
+#: LYMessages.c:599
 msgid "Saving Options..."
 msgstr "Menyimpan Opsi..."
 
-#: LYMessages.c:598
+#: LYMessages.c:600
 msgid "Options saved!"
 msgstr "Opsi disimpan!"
 
-#: LYMessages.c:599
+#: LYMessages.c:601
 msgid "Unable to save Options!"
 msgstr "Tidak dapat menyimpan Opsi!"
 
-#: LYMessages.c:600
+#: LYMessages.c:602
 msgid " 'r' to return to Lynx "
 msgstr " 'r' untuk kembali ke Lynx "
 
-#: LYMessages.c:601
+#: LYMessages.c:603
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' untuk menyimpan, atau 'r' untuk kembali ke Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:603
+#: LYMessages.c:605
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Tekan tombol apapun untuk mengubah nilai; RETURN untuk menerima."
 
-#: LYMessages.c:604
+#: LYMessages.c:606
 msgid "Error uncompressing temporary file!"
 msgstr "Error mengurai berkas sementara!"
 
-#: LYMessages.c:605
+#: LYMessages.c:607
 msgid "Unsupported URL scheme!"
 msgstr "Skema URL tidak didukung!"
 
-#: LYMessages.c:606
+#: LYMessages.c:608
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Data tidak didukung: URL! Gunakan SHOWINFO, untuk saat ini."
 
-#: LYMessages.c:607
+#: LYMessages.c:609
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Batas redireksi dari 10 URL dicapai."
 
-#: LYMessages.c:608
+#: LYMessages.c:610
 msgid "Illegal redirection URL received from server!"
 msgstr "Redireksi URL tidak legal diterima dari server!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:610
+#: LYMessages.c:612
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Server diminta untuk %d redireksi dari isi POST ke"
 
-#: LYMessages.c:613
+#: LYMessages.c:615
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)roceed, gunakan G)ET atau C)ancel "
 
-#: LYMessages.c:614
+#: LYMessages.c:616
 msgid "P)roceed, or C)ancel "
 msgstr "P)roceed, atau C)ancel "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:618
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Redireksi dari isi POST. P)roceed, lihat U)RL, gunakan G)ET atau C)ancel"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:618
+#: LYMessages.c:620
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Redireksi dari isi POST. P)roceed, lihat U)RL, atau C)ancel"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:620
+#: LYMessages.c:622
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Dokumen dari Form dengan isi POST. Kirim kembali?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:622
+#: LYMessages.c:624
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Kirim kembali isi POST ke %s?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:624
+#: LYMessages.c:626
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Daftar dari dokumen dengan data POST. Muat kembali %s ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:628
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Dokumen dari aksi POST, HEAD mungkin tidak dimengerti.  Lanjutkan?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:628
+#: LYMessages.c:630
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Aksi kirim formulir adalah POST, HEAD mungkin tidak dimengerti. Lanjutkan?"
 
-#: LYMessages.c:629
+#: LYMessages.c:631
 msgid "Proceed without a username and password?"
 msgstr "Lanjutkan tanpa sebuah nama pengguna dan sandi lewat?"
 
-#: LYMessages.c:630
+#: LYMessages.c:632
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Lanjutkan (%s)?"
 
-#: LYMessages.c:631
+#: LYMessages.c:633
 msgid "Cannot POST to this host."
 msgstr "Tidak dapat POST ke host ini."
 
-#: LYMessages.c:632
+#: LYMessages.c:634
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST tidak didukung untuk URL ini - mengabaikan data POST!"
 
-#: LYMessages.c:633
+#: LYMessages.c:635
 msgid "Discarding POST data..."
 msgstr "Mengabaikan data POST..."
 
-#: LYMessages.c:634
+#: LYMessages.c:636
 msgid "Document will not be reloaded!"
 msgstr "Dokumen tidak akan dimuat kembali!"
 
-#: LYMessages.c:635
+#: LYMessages.c:637
 msgid "Location: "
 msgstr "Lokasi: "
 
-#: LYMessages.c:636
+#: LYMessages.c:638
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' tidak ditemukan!"
 
-#: LYMessages.c:637
+#: LYMessages.c:639
 msgid "Default Bookmark File"
 msgstr "Berkas Bookmark Baku"
 
-#: LYMessages.c:638
+#: LYMessages.c:640
 msgid "Screen too small! (8x35 min)"
 msgstr "Layar terlalu kecil! (minimal 8x35)"
 
-#: LYMessages.c:639
+#: LYMessages.c:641
 msgid "Select destination or ^G to Cancel: "
 msgstr "Pilih tujuan atau ^G untuk membatalkan: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:641
+#: LYMessages.c:643
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Pilih subbookmark, '=' untuk menu, atau ^G untuk membatalkan: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:643
+#: LYMessages.c:645
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "Membuat kembali L)ink dalam berkas bookmark ini atau C)ancel? (l,c): "
 
-#: LYMessages.c:644
+#: LYMessages.c:646
 msgid "Multiple bookmark support is not available."
 msgstr "Dukungan multiple bookmark tidak tersedia."
 
-#: LYMessages.c:645
+#: LYMessages.c:647
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Pilih Bookmark (layar %d dari %d)"
 
-#: LYMessages.c:646
+#: LYMessages.c:648
 msgid "       Select Bookmark"
 msgstr "       Pilih Bookmark"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:648
+#: LYMessages.c:650
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Pengubahan DESKRIPSI bookmark dan FILEPATH (%d dari 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:650
+#: LYMessages.c:652
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Pengubahan DESKRIPSI bookmark dan FILEPATH"
 
-#: LYMessages.c:651
+#: LYMessages.c:653
 msgid "Letter: "
 msgstr "Huruf: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:654
+#: LYMessages.c:656
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Gunakan sebuah jalur berkas dari direktori login anda dalam sintaks SHELL!"
 
-#: LYMessages.c:656
+#: LYMessages.c:658
 msgid "Use a filepath off your home directory!"
 msgstr "Gunakan sebuah jalur berkas diluar dari direktori rumah anda!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:661
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Sambungan maksimal per halaman dilampaui! Gunakan setengah-halaman atau dua-baris scrolling."
 
-#: LYMessages.c:660
+#: LYMessages.c:662
 msgid "No previously visited links available!"
 msgstr "Tidak ada sebelumnya sambungan dikunjungi yang tersedia!"
 
-#: LYMessages.c:661
+#: LYMessages.c:663
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Kehabisan memori! Aplikasi dibatalkan!"
 
-#: LYMessages.c:662
+#: LYMessages.c:664
 msgid "Memory exhausted!  Aborting..."
 msgstr "Kehabisan memori! Membatalkan..."
 
-#: LYMessages.c:663
+#: LYMessages.c:665
 msgid "Not enough memory!"
 msgstr "Tidak cukup memori!"
 
-#: LYMessages.c:664
+#: LYMessages.c:666
 msgid "Directory/File Manager not available"
 msgstr "Direktori/Manajer Berkas tidak tersedia"
 
-#: LYMessages.c:665
+#: LYMessages.c:667
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF dalam tag BASE bukan sebuah URL absolut."
 
-#: LYMessages.c:666
+#: LYMessages.c:668
 msgid "Location URL is not absolute."
 msgstr "Lokasi URL tidak absolut."
 
-#: LYMessages.c:667
+#: LYMessages.c:669
 msgid "Refresh URL is not absolute."
 msgstr "Refresh URL tidak absolut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:671
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2036,7 +2051,7 @@
 "Anda sedang mengirimkan sebuah pesan dengan tubuh ke:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:672
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2044,7 +2059,7 @@
 "Anda sedang mengirimkan sebuah komentar ke:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:673
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2054,7 +2069,7 @@
 " Dengan salinan ke:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:674
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2065,7 +2080,7 @@
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:676
 msgid ""
 "\n"
 "\n"
@@ -2076,7 +2091,7 @@
 "Gunakan Ctrl-G untuk membatalkan jika anda tidak ingin mengirim sebuah pesan\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:678
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2085,7 +2100,7 @@
 " Mohon masukan nama anda, atau tinggalkan itu kosong supaya tetap anonim\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:680
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2094,11 +2109,11 @@
 " Mohon masukan sebuah alamat surat atau beberapa yang lain\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:682
 msgid " means to contact you, if you desire a response.\n"
 msgstr " cara untuk menghubungi anda, jika anda menginginkan sebuah balasan.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2107,7 +2122,7 @@
 " Mohon masukan sebuah baris subjek.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:685
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2115,11 +2130,11 @@
 "\n"
 " Masukan sebuah alamat surat untuk CC dari pesan anda.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:686
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Tinggalkan kosong jika anda tidak ingin sebuah salinan.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2129,7 +2144,7 @@
 " Mohon ulas kembali tubuh pesan:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:688
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2137,7 +2152,7 @@
 "\n"
 "Tekan RETURN untuk melanjutkan: "
 
-#: LYMessages.c:687
+#: LYMessages.c:689
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2145,11 +2160,11 @@
 "\n"
 "Tekan RETURN untuk membersihkan: "
 
-#: LYMessages.c:688
+#: LYMessages.c:690
 msgid " Use Control-U to erase the default.\n"
 msgstr " Gunakan Control-U untuk menghapus baku.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:691
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2158,7 +2173,7 @@
 " Mohon masukan pesan anda dibawah."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:360
+#: LYMessages.c:693 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2167,7 +2182,7 @@
 " Ketika anda telah selesai, tekan enter dan letakan sebuah titik tunggal (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:361
+#: LYMessages.c:695 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2177,257 +2192,257 @@
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:699
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s cookie: %.*s=%.*s  Ijinkan? (Y/N/Always/NeVer)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:701
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Terima cookie tidak valid domain=%s untuk '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:703
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Terima cookie tidak valid jalur=%s sebagai sebuah awalan dari '%s'?"
 
-#: LYMessages.c:702
+#: LYMessages.c:704
 msgid "Allowing this cookie."
 msgstr "Ijinkan cookie ini."
 
-#: LYMessages.c:703
+#: LYMessages.c:705
 msgid "Rejecting this cookie."
 msgstr "Menolak cookie ini."
 
-#: LYMessages.c:704
+#: LYMessages.c:706
 msgid "The Cookie Jar is empty."
 msgstr "Cookie Jar kosong."
 
-#: LYMessages.c:705
+#: LYMessages.c:707
 msgid "The Cache Jar is empty."
 msgstr "Cache Jar kosong."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:707
+#: LYMessages.c:709
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Aktifkan sambungan untuk gobble up cookies atau seluruh domains,"
 
-#: LYMessages.c:708
+#: LYMessages.c:710
 msgid "or to change a domain's 'allow' setting."
 msgstr "atau untuk mengubah sebuah domain 'allow' konfigurasi."
 
-#: LYMessages.c:709
+#: LYMessages.c:711
 msgid "(Cookies never allowed.)"
 msgstr "(Cookies tidak pernah diijinkan.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:712
 msgid "(Cookies always allowed.)"
 msgstr "(Cookies selalu diijinkan.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:713
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Cookies diijinkan melalui prompt.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:714
 msgid "(Persistent Cookies.)"
 msgstr "(Persistent Cookies.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:715
 msgid "(No title.)"
 msgstr "(Tidak ada judul.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:716
 msgid "(No name.)"
 msgstr "(Tidak ada nama.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:717
 msgid "(No value.)"
 msgstr "(Tidak ada nilai.)"
 
-#: LYMessages.c:716 src/LYOptions.c:2406
+#: LYMessages.c:718 src/LYOptions.c:2409
 msgid "None"
 msgstr "Kosong"
 
-#: LYMessages.c:717
+#: LYMessages.c:719
 msgid "(End of session.)"
 msgstr "(Akhir dari sesi.)"
 
-#: LYMessages.c:718
+#: LYMessages.c:720
 msgid "Delete this cookie?"
 msgstr "Hapus cookie ini?"
 
-#: LYMessages.c:719
+#: LYMessages.c:721
 msgid "The cookie has been eaten!"
 msgstr "Cookie telah dimakan!"
 
-#: LYMessages.c:720
+#: LYMessages.c:722
 msgid "Delete this empty domain?"
 msgstr "Hapus domain kosong ini?"
 
-#: LYMessages.c:721
+#: LYMessages.c:723
 msgid "The domain has been eaten!"
 msgstr "Domain telah dimakan!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:723
+#: LYMessages.c:725
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)elete domain cookies, set ijinkan A)lways/P)rompt/neV)er, atau C)ancel? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:725
+#: LYMessages.c:727
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)elete domain, set ijinkan A)lways/P)rompt/neV)er, atau C)ancel? "
 
-#: LYMessages.c:726
+#: LYMessages.c:728
 msgid "All cookies in the domain have been eaten!"
 msgstr "Seluruh cookies dalam domain telah dimakan!"
 
-#: LYMessages.c:727
+#: LYMessages.c:729
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "'A'lways mengijinkan dari domain '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:730
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "ne'V'er mengijinkan dari domain '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:731
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "'P'rompting untuk mengijinkan dari domain '%s'."
 
-#: LYMessages.c:730
+#: LYMessages.c:732
 msgid "Delete all cookies in this domain?"
 msgstr "hapus seluruh cookies dalam domain ini?"
 
-#: LYMessages.c:731
+#: LYMessages.c:733
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Seluruh cookies dalam jar telah dimakan!"
 
-#: LYMessages.c:733
+#: LYMessages.c:735
 msgid "Port 19 not permitted in URLs."
 msgstr "Port 19 tidak diijinkan dalam URL."
 
-#: LYMessages.c:734
+#: LYMessages.c:736
 msgid "Port 25 not permitted in URLs."
 msgstr "Port 25 tidak diijinkan dalam URL."
 
-#: LYMessages.c:735
+#: LYMessages.c:737
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Port %lu tidak diijinkan dalam URL."
 
-#: LYMessages.c:736
+#: LYMessages.c:738
 msgid "URL has a bad port field."
 msgstr "URL memiliki daerah port buruk."
 
-#: LYMessages.c:737
+#: LYMessages.c:739
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Jumlah maksimal nesting dari elemen HTML dilampaui"
 
-#: LYMessages.c:738
+#: LYMessages.c:740
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Referensi partial buruk! Stripping lead dots."
 
-#: LYMessages.c:739
+#: LYMessages.c:741
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Pembukaan catatan penjejakan gagal. Penjejakan tidak aktif!"
 
-#: LYMessages.c:740
+#: LYMessages.c:742
 msgid "Lynx Trace Log"
 msgstr "Catatan Jejak Lynx"
 
-#: LYMessages.c:741
+#: LYMessages.c:743
 msgid "No trace log has been started for this session."
 msgstr "Tidak ada catatan jejak yang telah dimulai untuk sesi ini."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:743
+#: LYMessages.c:745
 msgid "The maximum temporary file count has been reached!"
 msgstr "Jumlah maksimal berkas sementara telah dicapai!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:745
+#: LYMessages.c:747
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Nilai isi formulir melebihi panjang penyangga! Trim the tail."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:747
+#: LYMessages.c:749
 msgid "Modified tail combined with head of form field value."
 msgstr "Modifikasi tail dikombinasikan dengan kepala dari nilai bagian formulir."
 
 #. HTFile.c
-#: LYMessages.c:750
+#: LYMessages.c:752
 msgid "Directory"
 msgstr "Direktori"
 
-#: LYMessages.c:751
+#: LYMessages.c:753
 msgid "Directory browsing is not allowed."
 msgstr "Direktori browsing tidak diijinkan."
 
-#: LYMessages.c:752
+#: LYMessages.c:754
 msgid "Selective access is not enabled for this directory"
 msgstr "Akses selektif tidak aktif untuk direktori ini"
 
-#: LYMessages.c:753
+#: LYMessages.c:755
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: pemindaian direktori gagal."
 
-#: LYMessages.c:754
+#: LYMessages.c:756
 msgid "This directory is not readable."
 msgstr "Direktori ini tidak dapat dibaca."
 
-#: LYMessages.c:755
+#: LYMessages.c:757
 msgid "Can't access requested file."
 msgstr "Tidak dapat mengakses berkas yang diminta."
 
-#: LYMessages.c:756
+#: LYMessages.c:758
 msgid "Could not find suitable representation for transmission."
 msgstr "Tidak dapat menemukan representasi cocok untuk transmisi."
 
-#: LYMessages.c:757
+#: LYMessages.c:759
 msgid "Could not open file for decompression!"
 msgstr "Tidak dapat membuka berkas untuk dekompresi!"
 
-#: LYMessages.c:758
+#: LYMessages.c:760
 msgid "Files:"
 msgstr "Berkas:"
 
-#: LYMessages.c:759
+#: LYMessages.c:761
 msgid "Subdirectories:"
 msgstr "Subdirektori:"
 
-#: LYMessages.c:760
+#: LYMessages.c:762
 msgid " directory"
 msgstr " direktori"
 
-#: LYMessages.c:761
+#: LYMessages.c:763
 msgid "Up to "
 msgstr "Sampai ke "
 
-#: LYMessages.c:762
+#: LYMessages.c:764
 msgid "Current directory is "
 msgstr "Direktori saat ini adalah "
 
 #. HTFTP.c
-#: LYMessages.c:765
+#: LYMessages.c:767
 msgid "Symbolic Link"
 msgstr "Link simbolik"
 
 #. HTGopher.c
-#: LYMessages.c:768
+#: LYMessages.c:770
 msgid "No response from server!"
 msgstr "Tidak ada balasan dari server!"
 
-#: LYMessages.c:769
+#: LYMessages.c:771
 msgid "CSO index"
 msgstr "CSO indeks"
 
-#: LYMessages.c:770
+#: LYMessages.c:772
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2435,16 +2450,16 @@
 "\n"
 " Ini adalah sebuah indeks yang dapat dipindah dari sebuah basis data CSO.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:773
 msgid "CSO Search Results"
 msgstr "Hasil pencarian CSO"
 
-#: LYMessages.c:772
+#: LYMessages.c:774
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Pencarian gagal di %s\n"
 
-#: LYMessages.c:773
+#: LYMessages.c:775
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2452,7 +2467,7 @@
 "\n"
 "Tekan tombol 's'  dan masukan kata kunci pencarian.\n"
 
-#: LYMessages.c:774
+#: LYMessages.c:776
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2460,35 +2475,35 @@
 "\n"
 "Ini adalah sebuah indeks Gopher yang dapat dipindai.\n"
 
-#: LYMessages.c:775
+#: LYMessages.c:777
 msgid "Gopher index"
 msgstr "Indeks Gopher"
 
-#: LYMessages.c:776
+#: LYMessages.c:778
 msgid "Gopher Menu"
 msgstr "Menu Gopher"
 
-#: LYMessages.c:777
+#: LYMessages.c:779
 msgid " Search Results"
 msgstr " Hasil Pencarian"
 
-#: LYMessages.c:778
+#: LYMessages.c:780
 msgid "Sending CSO/PH request."
 msgstr "Mengirimkan permintaan CSO/PH."
 
-#: LYMessages.c:779
+#: LYMessages.c:781
 msgid "Sending Gopher request."
 msgstr "Mengirimkan permintaan Gopher."
 
-#: LYMessages.c:780
+#: LYMessages.c:782
 msgid "CSO/PH request sent; waiting for response."
 msgstr "Permintaan CSO/PH dikirimkan; menunggu balasan."
 
-#: LYMessages.c:781
+#: LYMessages.c:783
 msgid "Gopher request sent; waiting for response."
 msgstr "Permintaan Gopher dikirimkan; menunggu balasan."
 
-#: LYMessages.c:782
+#: LYMessages.c:784
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2496,7 +2511,7 @@
 "\n"
 "Mohon masukan kata kunci pencarian.\n"
 
-#: LYMessages.c:783
+#: LYMessages.c:785
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2504,201 +2519,201 @@
 "\n"
 "Kata kunci yang anda masukan akan mengijinkan anda untuk mencari di"
 
-#: LYMessages.c:784
+#: LYMessages.c:786
 msgid " person's name in the database.\n"
 msgstr " nama orang dalam basis data.\n"
 
 #. HTNews.c
-#: LYMessages.c:787
+#: LYMessages.c:789
 msgid "Connection closed ???"
 msgstr "Koneksi ditutup ???"
 
-#: LYMessages.c:788
+#: LYMessages.c:790
 msgid "Cannot open temporary file for news POST."
 msgstr "Tidak dapat membuka berkas sementara untuk news POST."
 
-#: LYMessages.c:789
+#: LYMessages.c:791
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Klien ini tidak berisi dukungan untuk posting ke news dengan SSL."
 
 #. HTStyle.c
-#: LYMessages.c:792
+#: LYMessages.c:794
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Gaya %d `%s'  SGML:%s. Font %s %.1f titik.\n"
 
-#: LYMessages.c:794
+#: LYMessages.c:796
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tAlign=%d, %d tabs. (%.0f sebelumnya, %.0f sesudahnya)\n"
 
-#: LYMessages.c:795
+#: LYMessages.c:797
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tTab jenis=%d di %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:798
+#: LYMessages.c:800
 msgid "Can't proceed without a username and password."
 msgstr "Tidak dapat melanjutkan tanpa sebuah nama pengguna dan kata sandi"
 
-#: LYMessages.c:799
+#: LYMessages.c:801
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Tidak dapat mencoba dengan otorisasi! Hubungi WebMaster server."
 
-#: LYMessages.c:800
+#: LYMessages.c:802
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Tidak dapat mencoba dengan proxy otorisasi! Hubungi WebMaster server."
 
-#: LYMessages.c:801
+#: LYMessages.c:803
 msgid "Retrying with proxy authorization information."
 msgstr "Mencoba dengan informasi otorisasi proxy."
 
-#: LYMessages.c:802
+#: LYMessages.c:804
 #, c-format
 msgid "SSL error:%s-Continue?"
 msgstr "SSL error:%s-Lanjutkan?"
 
 #. HTWAIS.c
-#: LYMessages.c:805
+#: LYMessages.c:807
 msgid "HTWAIS: Return message too large."
 msgstr "HTWIS: Pesan yang dikembalikan terlalu besar."
 
-#: LYMessages.c:806
+#: LYMessages.c:808
 msgid "Enter WAIS query: "
 msgstr "Masukan permintaan WAIS: "
 
 #. Miscellaneous status
-#: LYMessages.c:809
+#: LYMessages.c:811
 msgid "Retrying as HTTP0 request."
 msgstr "Mencoba kembali sebagai permintaan HTTPO."
 
-#: LYMessages.c:810
+#: LYMessages.c:812
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "Dikirimkan %d bytes"
 
-#: LYMessages.c:811
+#: LYMessages.c:813
 msgid "Data transfer complete"
 msgstr "Transfer data selesai"
 
-#: LYMessages.c:812
+#: LYMessages.c:814
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Error memproses baris %d dari %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:815
+#: LYMessages.c:817
 msgid "Address List Page"
 msgstr "Daftar halaman alamat"
 
-#: LYMessages.c:816
+#: LYMessages.c:818
 msgid "Bookmark file"
 msgstr "Berkas bookmark"
 
-#: LYMessages.c:817
+#: LYMessages.c:819
 msgid "Configuration Definitions"
 msgstr "Definisi konfigurasi"
 
-#: LYMessages.c:818
+#: LYMessages.c:820
 msgid "Cookie Jar"
 msgstr "Cookie Jar"
 
-#: LYMessages.c:819
+#: LYMessages.c:821
 msgid "Current Key Map"
 msgstr "Peta kunci saat ini"
 
-#: LYMessages.c:820
+#: LYMessages.c:822
 msgid "File Management Options"
 msgstr "Opsi manajemen berkas"
 
-#: LYMessages.c:821
+#: LYMessages.c:823
 msgid "Download Options"
 msgstr "Opsi unduh"
 
-#: LYMessages.c:822
+#: LYMessages.c:824
 msgid "History Page"
 msgstr "Halaman sejarah"
 
-#: LYMessages.c:823
+#: LYMessages.c:825
 msgid "Cache Jar"
 msgstr "Cache Jar"
 
-#: LYMessages.c:824
+#: LYMessages.c:826
 msgid "List Page"
 msgstr "Daftar Halaman"
 
-#: LYMessages.c:825
+#: LYMessages.c:827
 msgid "Lynx.cfg Information"
 msgstr "Informasi Lynx.cfg"
 
-#: LYMessages.c:826
+#: LYMessages.c:828
 msgid "Converted Mosaic Hotlist"
 msgstr "Diubah Mosaic Hotlist"
 
-#: LYMessages.c:827
+#: LYMessages.c:829
 msgid "Options Menu"
 msgstr "Opsi menu"
 
-#: LYMessages.c:828
+#: LYMessages.c:830
 msgid "File Permission Options"
 msgstr "Opsi ijin berkas"
 
-#: LYMessages.c:829
+#: LYMessages.c:831
 msgid "Printing Options"
 msgstr "Opsi pencetakan"
 
-#: LYMessages.c:830
+#: LYMessages.c:832
 msgid "Information about the current document"
 msgstr "Informasi mengenai dokumen saat ini"
 
-#: LYMessages.c:831
+#: LYMessages.c:833
 msgid "Your recent statusline messages"
 msgstr "Pesan baris status anda baru baru ini"
 
-#: LYMessages.c:832
+#: LYMessages.c:834
 msgid "Upload Options"
 msgstr "Opsi upload"
 
-#: LYMessages.c:833
+#: LYMessages.c:835
 msgid "Visited Links Page"
 msgstr "Sambungan halaman yang pernah dikunjungi"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:836
+#: LYMessages.c:838
 msgid "See also"
 msgstr "Lihat juga"
 
-#: LYMessages.c:837
+#: LYMessages.c:839
 msgid "your"
 msgstr "anda"
 
-#: LYMessages.c:838
+#: LYMessages.c:840
 msgid "for runtime options"
 msgstr "opsi untuk waktu jalan"
 
-#: LYMessages.c:839
+#: LYMessages.c:841
 msgid "compile time options"
 msgstr "opsi waktu kompilasi"
 
-#: LYMessages.c:840
+#: LYMessages.c:842
 msgid "color-style configuration"
 msgstr "konfigurasi gaya-warna"
 
-#: LYMessages.c:841
+#: LYMessages.c:843
 msgid "latest release"
 msgstr "keluaran terakhir"
 
-#: LYMessages.c:842
+#: LYMessages.c:844
 msgid "pre-release version"
 msgstr "versi sebelum dikeluarkan"
 
-#: LYMessages.c:843
+#: LYMessages.c:845
 msgid "development version"
 msgstr "versi pengembangan"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:845
+#: LYMessages.c:847
 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"
@@ -2709,7 +2724,7 @@
 "sebuah salinan dari halaman ini."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:849
+#: LYMessages.c:851
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2718,110 +2733,116 @@
 "ketika salinan dari lynx dibuat."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:854
+#: LYMessages.c:856
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 
-#: LYMessages.c:855
+#: LYMessages.c:857
 msgid "Failed to obtain status of current link!"
 msgstr "Gagal untuk memperoleh status dari sambungan sekarang!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:858
+#: LYMessages.c:860
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Hanya URL spesial saja yang valid dari menu permisi berkas sekarang!"
 
-#: LYMessages.c:862
+#: LYMessages.c:864
 msgid "External support is currently disabled."
 msgstr "Dukungan eksternal saat ini tidak aktif."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:866
+#: LYMessages.c:868
 msgid "Changing working-directory is currently disabled."
 msgstr "Pengubahan direktori kerja saat ini tidak aktif."
 
-#: LYMessages.c:867
+#: LYMessages.c:869
 msgid "Linewrap OFF!"
 msgstr "Linewrap OFF!"
 
-#: LYMessages.c:868
+#: LYMessages.c:870
 msgid "Linewrap ON!"
 msgstr "Linewrap ON!"
 
-#: LYMessages.c:869
+#: LYMessages.c:871
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Parsing nested tables dimatikan! Memuat kembali..."
 
-#: LYMessages.c:870
+#: LYMessages.c:872
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Parsing nested tables diaktifkan! Memuat kembali..."
 
-#: LYMessages.c:871
+#: LYMessages.c:873
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr "Shifting tidak aktif ketika line-wrap berada dalam efek"
 
-#: LYMessages.c:872
+#: LYMessages.c:874
 msgid "Trace not supported"
 msgstr "Trace tidak didukung"
 
-#: LYMessages.c:793
+#: LYMessages.c:795
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tIndents: pertama=%.0f lain=%.0f, Tinggi=%.1f Desc=%.1f\n"
 
-#: WWW/Library/Implementation/HTAABrow.c:626
+#.
+#. * 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
+#.
+#: WWW/Library/Implementation/HTAABrow.c:634
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Nama pengguna untuk '%s' di %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:894
+#: WWW/Library/Implementation/HTAABrow.c:904
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Klien ini tidak tahu bagaimana mengisi informasi otorisasi proxy untuk skema"
 
-#: WWW/Library/Implementation/HTAABrow.c:971
+#: WWW/Library/Implementation/HTAABrow.c:983
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Klien ini tidak tahu bagaimana mengisi informasi otorisasi untuk skema"
 
-#: WWW/Library/Implementation/HTAABrow.c:1079
+#: WWW/Library/Implementation/HTAABrow.c:1093
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Header tidak  valid '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1181
+#: WWW/Library/Implementation/HTAABrow.c:1198
 msgid "Proxy authorization required -- retrying"
 msgstr "Otorisasi proxy dibutuhkan -- memcoba"
 
-#: WWW/Library/Implementation/HTAABrow.c:1239
+#: WWW/Library/Implementation/HTAABrow.c:1256
 msgid "Access without authorization denied -- retrying"
 msgstr "Akses tanpa otorisasi ditolak -- mencoba"
 
-#: WWW/Library/Implementation/HTAccess.c:688
+#: WWW/Library/Implementation/HTAccess.c:698
 msgid "Access forbidden by rule"
 msgstr "Akses dilarang oleh aturan"
 
-#: WWW/Library/Implementation/HTAccess.c:783
+#: WWW/Library/Implementation/HTAccess.c:793
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Dokumen dengan isi POST tidak ditemukan dalam cache. Kirim kembali?"
 
-#: WWW/Library/Implementation/HTAccess.c:938
+#: WWW/Library/Implementation/HTAccess.c:949
 msgid "Loading failed, use a previous copy."
 msgstr "Pemuatan gagal, gunakan salinan sebelumnya."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8513
+#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8867
 msgid "Loading incomplete."
 msgstr "Pemuatan tidak lengkap."
 
-#: WWW/Library/Implementation/HTAccess.c:1078
+#: WWW/Library/Implementation/HTAccess.c:1089
 #, c-format
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HHTAccess: socket atau nomor berkas yang dikembalikan oleh pemuatan rutinitas sudah ditinggalkan!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1080
+#: WWW/Library/Implementation/HTAccess.c:1091
 #, c-format
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@nongnu.org!\n"
 msgstr "**** HTAccess: Internal software error. Mohon kirimkan surat ke lynx-dev@nongnu.org!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1081
+#: WWW/Library/Implementation/HTAccess.c:1092
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Status yang dikembalikan: %d\n"
@@ -2830,96 +2851,96 @@
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7757
+#: WWW/Library/Implementation/HTAccess.c:1098 src/LYMainLoop.c:8050
 msgid "Can't Access"
 msgstr "Tidak dapat mengakses"
 
-#: WWW/Library/Implementation/HTAccess.c:1095
+#: WWW/Library/Implementation/HTAccess.c:1106
 msgid "Unable to access document."
 msgstr "Tidak dapat mengakses dokumen."
 
-#: WWW/Library/Implementation/HTFTP.c:843
+#: WWW/Library/Implementation/HTFTP.c:849
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Masukan kata sandi untuk pengguna %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:871
+#: WWW/Library/Implementation/HTFTP.c:877
 msgid "Unable to connect to FTP host."
 msgstr "Tidak dapat menghubungi ke FTP host."
 
-#: WWW/Library/Implementation/HTFTP.c:1152
+#: WWW/Library/Implementation/HTFTP.c:1158
 msgid "close master socket"
 msgstr "tutup master socket"
 
-#: WWW/Library/Implementation/HTFTP.c:1214
+#: WWW/Library/Implementation/HTFTP.c:1220
 msgid "socket for master socket"
 msgstr "socket untuk master socket"
 
-#: WWW/Library/Implementation/HTFTP.c:2976
+#: WWW/Library/Implementation/HTFTP.c:2986
 msgid "Receiving FTP directory."
 msgstr "Menerima direktori FTP."
 
-#: WWW/Library/Implementation/HTFTP.c:3112
+#: WWW/Library/Implementation/HTFTP.c:3122
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Ditransfer %d bytes (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3466
+#: WWW/Library/Implementation/HTFTP.c:3480
 msgid "connect for data"
 msgstr "hubungi untuk data"
 
-#: WWW/Library/Implementation/HTFTP.c:4127
+#: WWW/Library/Implementation/HTFTP.c:4141
 msgid "Receiving FTP file."
 msgstr "Menerima berkas FTP."
 
-#: WWW/Library/Implementation/HTFinger.c:273
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Tidak dapat menset up koneksi finger."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Tidak dapat memuat  data (tidak ada nama site dalam finger URL)"
 
-#: WWW/Library/Implementation/HTFinger.c:326
+#: WWW/Library/Implementation/HTFinger.c:329
 msgid "Invalid port number - will only use port 79!"
 msgstr "Nomor port tidak valid - hanya akan menggunakan port 79!"
 
-#: WWW/Library/Implementation/HTFinger.c:392
+#: WWW/Library/Implementation/HTFinger.c:395
 msgid "Could not access finger host."
 msgstr "Tidak dapat mengakses host finger."
 
-#: WWW/Library/Implementation/HTFinger.c:400
+#: WWW/Library/Implementation/HTFinger.c:403
 msgid "No response from finger server."
 msgstr "Tidak ada balasan dari server finger."
 
-#: WWW/Library/Implementation/HTNews.c:425
+#: WWW/Library/Implementation/HTNews.c:421
 #, c-format
 msgid "Username for news host '%s':"
 msgstr "Nama pengguna untuk news host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:478
+#: WWW/Library/Implementation/HTNews.c:474
 msgid "Change username?"
 msgstr "Ubah nama pengguna?"
 
-#: WWW/Library/Implementation/HTNews.c:482
+#: WWW/Library/Implementation/HTNews.c:478
 msgid "Username:"
 msgstr "Nama pengguna:"
 
-#: WWW/Library/Implementation/HTNews.c:507
+#: WWW/Library/Implementation/HTNews.c:503
 #, c-format
 msgid "Password for news host '%s':"
 msgstr "Kata sandi untuk news host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:590
+#: WWW/Library/Implementation/HTNews.c:586
 msgid "Change password?"
 msgstr "Ubah kata sandi?"
 
-#: WWW/Library/Implementation/HTNews.c:1710
+#: WWW/Library/Implementation/HTNews.c:1707
 #, c-format
 msgid "No matches for: %s"
 msgstr "Tidak cocok untuk: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1760
+#: WWW/Library/Implementation/HTNews.c:1757
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2927,7 +2948,7 @@
 "\n"
 "Tidak ada artikel dalam grup ini.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1772
+#: WWW/Library/Implementation/HTNews.c:1769
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2938,16 +2959,16 @@
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1785
+#: WWW/Library/Implementation/HTNews.c:1782
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s, Artikel %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1808
+#: WWW/Library/Implementation/HTNews.c:1805
 msgid "Earlier articles"
 msgstr "Artikel sebelumnya"
 
-#: WWW/Library/Implementation/HTNews.c:1821
+#: WWW/Library/Implementation/HTNews.c:1818
 #, c-format
 msgid ""
 "\n"
@@ -2958,41 +2979,41 @@
 "Disana ada sekitar %d artikel yang saat ini tersedia dalam %s, ID sebagai berikut:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1883
+#: WWW/Library/Implementation/HTNews.c:1880
 msgid "All available articles in "
 msgstr "Semua artikel yang tersedia dalam "
 
-#: WWW/Library/Implementation/HTNews.c:2097
+#: WWW/Library/Implementation/HTNews.c:2094
 msgid "Later articles"
 msgstr "Artikel selanjutnya"
 
-#: WWW/Library/Implementation/HTNews.c:2120
+#: WWW/Library/Implementation/HTNews.c:2117
 msgid "Post to "
 msgstr "Post ke "
 
-#: WWW/Library/Implementation/HTNews.c:2341
+#: WWW/Library/Implementation/HTNews.c:2338
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Klien ini tidak memiliki dukungan untuk URL SNEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2548
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Tidak ada target untuk teks mentah!"
 
-#: WWW/Library/Implementation/HTNews.c:2578
+#: WWW/Library/Implementation/HTNews.c:2575
 msgid "Connecting to NewsHost ..."
 msgstr "Menghubungi ke NewsHost ..."
 
-#: WWW/Library/Implementation/HTNews.c:2630
+#: WWW/Library/Implementation/HTNews.c:2627
 #, c-format
 msgid "Could not access %s."
 msgstr "Tidak dapat mengakses %s."
 
-#: WWW/Library/Implementation/HTNews.c:2736
+#: WWW/Library/Implementation/HTNews.c:2733
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Tidak dapat membaca informasi news. News host %.20s dibalas: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2740
+#: WWW/Library/Implementation/HTNews.c:2737
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Tidak dapat membaca informasi news, balasan kosong dari host %s"
@@ -3000,34 +3021,35 @@
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2944
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of available newsgroups."
 msgstr "Membaca daftar dari newsgroups yang tersedia."
 
-#: WWW/Library/Implementation/HTNews.c:2965
+#: WWW/Library/Implementation/HTNews.c:2962
 msgid "Reading list of articles in newsgroup."
 msgstr "Membaca daftar dari artikel dalam newsgrup."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2971
+#: WWW/Library/Implementation/HTNews.c:2968
 msgid "Reading news article."
 msgstr "Membaca news artikel."
 
-#: WWW/Library/Implementation/HTNews.c:3001
+#: WWW/Library/Implementation/HTNews.c:2998
 msgid "Sorry, could not load requested news."
 msgstr "Maaf, tidak dapat memuat berita yang diminta."
 
-#: WWW/Library/Implementation/HTTCP.c:1282
+#: WWW/Library/Implementation/HTTCP.c:1286
 msgid "Address has invalid port"
 msgstr "Alamat memiliki port tidak valid"
 
-#: WWW/Library/Implementation/HTTCP.c:1358
+#: WWW/Library/Implementation/HTTCP.c:1362
 msgid "Address length looks invalid"
 msgstr "Panjang alamat kelihatannya tidak valid"
 
-#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1622
+#: WWW/Library/Implementation/HTTCP.c:1640
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Tidak dapat melokasi remote host %s."
@@ -3036,130 +3058,132 @@
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1637
+#: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Nama host tidak valid %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1651
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Membuat %s koneksi ke %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1658
+#: WWW/Library/Implementation/HTTCP.c:1662
 msgid "socket failed."
 msgstr "socket gagal."
 
-#: WWW/Library/Implementation/HTTCP.c:1671
+#: WWW/Library/Implementation/HTTCP.c:1676
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "socket gagal: keluarga %d alamat %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1695
+#: WWW/Library/Implementation/HTTCP.c:1700
 msgid "Could not make connection non-blocking."
 msgstr "Tidak dapat membuat koneksi tidak terblok."
 
-#: WWW/Library/Implementation/HTTCP.c:1763
+#: WWW/Library/Implementation/HTTCP.c:1768
 msgid "Connection failed (too many retries)."
 msgstr "Koneksi gagal (terlalu banyak percobaan)."
 
-#: WWW/Library/Implementation/HTTCP.c:1950
+#: WWW/Library/Implementation/HTTCP.c:1955
 msgid "Could not restore socket to blocking."
 msgstr "Tidak dapat mengembalikan socket ke bloking."
 
-#: WWW/Library/Implementation/HTTCP.c:2016
+#: WWW/Library/Implementation/HTTCP.c:2021
 msgid "Socket read failed (too many tries)."
 msgstr "Pembacaan socket gagal (terlalu banyak percobaan)."
 
-#: WWW/Library/Implementation/HTTP.c:84
+#: WWW/Library/Implementation/HTTP.c:81
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:406
+#: WWW/Library/Implementation/HTTP.c:432
 #, c-format
 msgid "Address contains a username: %s"
 msgstr "Alamat berisi sebuah nama pengguna: %s"
 
-#: WWW/Library/Implementation/HTTP.c:460
+#: WWW/Library/Implementation/HTTP.c:486
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Sertifikan diisukan oleh: %s"
 
-#: WWW/Library/Implementation/HTTP.c:643
+#: WWW/Library/Implementation/HTTP.c:673
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Klien ini tidak berisi dukungan untuk URL HTTPS."
 
-#: WWW/Library/Implementation/HTTP.c:668
+#: WWW/Library/Implementation/HTTP.c:698
 msgid "Unable to connect to remote host."
 msgstr "Tidak dapat menghubungi ke remote host."
 
-#: WWW/Library/Implementation/HTTP.c:692
+#: WWW/Library/Implementation/HTTP.c:730
 msgid "Retrying connection without TLS."
 msgstr "Mencoba koneksi tanpa TLS."
 
-#: WWW/Library/Implementation/HTTP.c:737
+#: WWW/Library/Implementation/HTTP.c:773
 msgid "no issuer was found"
 msgstr "tidak ada penerbit yang ditemukan"
 
-#: WWW/Library/Implementation/HTTP.c:739
+#: WWW/Library/Implementation/HTTP.c:775
 msgid "issuer is not a CA"
 msgstr "penerbit bukan sebuah CA"
 
-#: WWW/Library/Implementation/HTTP.c:741
+#: WWW/Library/Implementation/HTTP.c:777
 msgid "the certificate has no known issuer"
 msgstr "sertifikat tidak memiliki penerbit yang diketahui"
 
-#: WWW/Library/Implementation/HTTP.c:743
+#: WWW/Library/Implementation/HTTP.c:779
 msgid "the certificate has been revoked"
 msgstr "sertifikat telah dicabut"
 
-#: WWW/Library/Implementation/HTTP.c:745
+#: WWW/Library/Implementation/HTTP.c:781
 msgid "the certificate is not trusted"
 msgstr "sertifikat tidak dipercaya"
 
-#: WWW/Library/Implementation/HTTP.c:821
+#: WWW/Library/Implementation/HTTP.c:855
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Koneksi terverifikasi ke %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:869 WWW/Library/Implementation/HTTP.c:911
+#: WWW/Library/Implementation/HTTP.c:903 WWW/Library/Implementation/HTTP.c:945
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "Koneksi terverifikasi ke %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:941
+#: WWW/Library/Implementation/HTTP.c:975
 msgid "Can't find common name in certificate"
 msgstr "Tidak dapat menemukan nama sama dalam sertifikat"
 
-#: WWW/Library/Implementation/HTTP.c:944
+#: WWW/Library/Implementation/HTTP.c:978
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL error:host(%s)!=cert(%s)-Lanjutkan?"
 
-#: WWW/Library/Implementation/HTTP.c:957
+#: WWW/Library/Implementation/HTTP.c:991
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "Koneksi TIDAK TERVERIFIKASI ke %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:966
+#: WWW/Library/Implementation/HTTP.c:1000
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Aman %d-bit %s (%s) koneksi HTTP"
 
-#: WWW/Library/Implementation/HTTP.c:1433
+#: WWW/Library/Implementation/HTTP.c:1467
 msgid "Sending HTTP request."
 msgstr "Mengirimkan permintaan HTTP."
 
-#: WWW/Library/Implementation/HTTP.c:1472
+#: WWW/Library/Implementation/HTTP.c:1509
 msgid "Unexpected network write error; connection aborted."
 msgstr "Tidak terduga penulisan jaringan error: koneksi dibatalkan."
 
-#: WWW/Library/Implementation/HTTP.c:1478
+#: WWW/Library/Implementation/HTTP.c:1515
 msgid "HTTP request sent; waiting for response."
 msgstr "permintaan HTTP dikirimkan; menunggu balasan."
 
-#: WWW/Library/Implementation/HTTP.c:1546
+#: WWW/Library/Implementation/HTTP.c:1588
+#: WWW/Library/Implementation/HTTP.c:1598
 msgid "Unexpected network read error; connection aborted."
 msgstr "Tidak terduga pembacaan jaringan error; koneksi dibatalkan."
 
@@ -3172,7 +3196,7 @@
 #. * 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:1740
+#: WWW/Library/Implementation/HTTP.c:1800
 msgid "Got unexpected Informational Status."
 msgstr "Diperoleh Status Informasi tidak terduga."
 
@@ -3182,7 +3206,7 @@
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1774
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Request fulfilled.  Reset Content."
 msgstr "Permintaan dipenuhi. Reset Isi."
 
@@ -3192,27 +3216,27 @@
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1890
+#: WWW/Library/Implementation/HTTP.c:1949
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Diperoleh tidak terduga 304 status Tidak Termodifikasi."
 
-#: WWW/Library/Implementation/HTTP.c:1953
+#: WWW/Library/Implementation/HTTP.c:2012
 msgid "Redirection of POST content requires user approval."
 msgstr "Redireksi dari isi POST membutuhkan persetujuan pengguna."
 
-#: WWW/Library/Implementation/HTTP.c:1968
+#: WWW/Library/Implementation/HTTP.c:2027
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Memiliki isi POST. Memperlakukan Redireksi Permanen sebagai Sementara.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2010
+#: WWW/Library/Implementation/HTTP.c:2071
 msgid "Retrying with access authorization information."
 msgstr "Mencoba kembali dengan informasi otorisasi akses."
 
-#: WWW/Library/Implementation/HTTP.c:2022
+#: WWW/Library/Implementation/HTTP.c:2083
 msgid "Show the 401 message body?"
 msgstr "Tampilkan tubuh pesan 401?"
 
-#: WWW/Library/Implementation/HTTP.c:2065
+#: WWW/Library/Implementation/HTTP.c:2127
 msgid "Show the 407 message body?"
 msgstr "Tampilkan tubuh pesan 407?"
 
@@ -3220,7 +3244,7 @@
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2165
+#: WWW/Library/Implementation/HTTP.c:2227
 msgid "Unknown status reply from server!"
 msgstr "Balasan status dari server tidak diketahui!"
 
@@ -3229,15 +3253,15 @@
 msgid "remote %s session:"
 msgstr "remote %s sesi:"
 
-#: WWW/Library/Implementation/HTWAIS.c:162
+#: WWW/Library/Implementation/HTWAIS.c:163
 msgid "Could not connect to WAIS server."
 msgstr "Tidak dapat menghubungi ke server WAIS."
 
-#: WWW/Library/Implementation/HTWAIS.c:170
+#: WWW/Library/Implementation/HTWAIS.c:171
 msgid "Could not open WAIS connection for reading."
 msgstr "Tidak dapat membuka koneksi WAIS untuk pembacaan."
 
-#: WWW/Library/Implementation/HTWAIS.c:192
+#: WWW/Library/Implementation/HTWAIS.c:193
 msgid "Diagnostic code is "
 msgstr "Kode diagnosa adalah "
 
@@ -3375,143 +3399,143 @@
 msgid "No text was returned!\n"
 msgstr "Tidak ada teks yang dikembalikan!\n"
 
-#: WWW/Library/Implementation/HTWSRC.c:296
+#: WWW/Library/Implementation/HTWSRC.c:301
 msgid " NOT GIVEN in source file; "
 msgstr " TIDAK DIBERIKAN dalam berkas sumber; "
 
-#: WWW/Library/Implementation/HTWSRC.c:319
+#: WWW/Library/Implementation/HTWSRC.c:324
 msgid " WAIS source file"
 msgstr " berkas sumber WAIS"
 
-#: WWW/Library/Implementation/HTWSRC.c:326
+#: WWW/Library/Implementation/HTWSRC.c:331
 msgid " description"
 msgstr " deskripsi"
 
-#: WWW/Library/Implementation/HTWSRC.c:336
+#: WWW/Library/Implementation/HTWSRC.c:341
 msgid "Access links"
 msgstr "links akses"
 
-#: WWW/Library/Implementation/HTWSRC.c:357
+#: WWW/Library/Implementation/HTWSRC.c:362
 msgid "Direct access"
 msgstr "Akses langsung"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:360
+#: WWW/Library/Implementation/HTWSRC.c:365
 msgid " (or via proxy server, if defined)"
 msgstr " (atau melalui server proxy, jika didefinisikan)"
 
-#: WWW/Library/Implementation/HTWSRC.c:375
+#: WWW/Library/Implementation/HTWSRC.c:380
 msgid "Maintainer"
 msgstr "Pengelola"
 
-#: WWW/Library/Implementation/HTWSRC.c:383
+#: WWW/Library/Implementation/HTWSRC.c:388
 msgid "Host"
 msgstr "Host"
 
-#: src/GridText.c:704
+#: src/GridText.c:699
 msgid "Memory exhausted, display interrupted!"
 msgstr "Kehabisan memori, penampilan terinterupsi!"
 
-#: src/GridText.c:709
+#: src/GridText.c:704
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Kehabisan memori, akan menginterupsi transfer!"
 
-#: src/GridText.c:3663
+#: src/GridText.c:3685
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** KEHABISAN MEMORI ***"
 
-#: src/GridText.c:6057 src/GridText.c:6064 src/LYList.c:239
-msgid "unknown field or link"
-msgstr "field atau link tidak diketahui"
-
-#: src/GridText.c:6073
+#: src/GridText.c:6146
 msgid "text entry field"
 msgstr "daerah masukan teks"
 
-#: src/GridText.c:6076
+#: src/GridText.c:6149
 msgid "password entry field"
 msgstr "daerah masukan kata sandi"
 
-#: src/GridText.c:6079
+#: src/GridText.c:6152
 msgid "checkbox"
 msgstr "checkbox"
 
-#: src/GridText.c:6082
+#: src/GridText.c:6155
 msgid "radio button"
 msgstr "tombol radio"
 
-#: src/GridText.c:6085
+#: src/GridText.c:6158
 msgid "submit button"
 msgstr "tombol kirim"
 
-#: src/GridText.c:6088
+#: src/GridText.c:6161
 msgid "reset button"
 msgstr "tombol reset"
 
-#: src/GridText.c:6091
+#: src/GridText.c:6164
+msgid "script button"
+msgstr "tombol kirim"
+
+#: src/GridText.c:6167
 msgid "popup menu"
 msgstr "menu popup"
 
-#: src/GridText.c:6094
+#: src/GridText.c:6170
 msgid "hidden form field"
 msgstr "daerah formulir tersembunyi"
 
-#: src/GridText.c:6097
+#: src/GridText.c:6173
 msgid "text entry area"
 msgstr "daerah masukan teks"
 
-#: src/GridText.c:6100
+#: src/GridText.c:6176
 msgid "range entry field"
 msgstr "daerah masukan jangkauan"
 
-#: src/GridText.c:6103
+#: src/GridText.c:6179
 msgid "file entry field"
 msgstr "daerah masukan berkas"
 
-#: src/GridText.c:6106
+#: src/GridText.c:6182
 msgid "text-submit field"
 msgstr "daerah teks-kirim"
 
-#: src/GridText.c:6109
+#: src/GridText.c:6185
 msgid "image-submit button"
 msgstr "tombol gambar-kirim"
 
-#: src/GridText.c:6112
+#: src/GridText.c:6188
 msgid "keygen field"
 msgstr "daerah keygen"
 
-#: src/GridText.c:6115
+#: src/GridText.c:6191
 msgid "unknown form field"
 msgstr "daerah formulir tidak diketahui"
 
-#: src/GridText.c:10245
+#: src/GridText.c:6211 src/GridText.c:6218 src/LYList.c:248
+msgid "unknown field or link"
+msgstr "field atau link tidak diketahui"
+
+#: src/GridText.c:10649
 msgid "Can't open file for uploading"
 msgstr "Tidak dapat membuka berkas untuk upload"
 
-#: src/GridText.c:11404
+#: src/GridText.c:11837
 #, c-format
 msgid "Submitting %s"
 msgstr "Mengirimkan %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12457
+#: src/GridText.c:12894
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Hang Deteksi: TextAnchor struct terkorupsi - disarankan untuk dibatalkan!"
 
 #. don't show previous state
-#: src/GridText.c:12594
+#: src/GridText.c:13056
 msgid "Wrap lines to fit displayed area?"
 msgstr "Potong baris untuk menyesuaikan daerah penampilan?"
 
-#: src/GridText.c:12646
-msgid "Very long lines have been wrapped!"
-msgstr "Baris sangat panjang telah dipotong!"
-
-#: src/GridText.c:13151
+#: src/GridText.c:13696
 msgid "Very long lines have been truncated!"
 msgstr "Baris sangat panjang telah dipotong!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
+#: src/HTAlert.c:164 src/LYShowInfo.c:364 src/LYShowInfo.c:368
 msgid "bytes"
 msgstr "byte"
 
@@ -3519,32 +3543,32 @@
 #. * If we know the total size of the file, we can compute
 #. * a percentage, and show a corresponding progress bar.
 #.
-#: src/HTAlert.c:300 src/HTAlert.c:324
+#: src/HTAlert.c:303 src/HTAlert.c:329
 #, c-format
 msgid "Read %s of data"
 msgstr "Terbaca %s dari data"
 
-#: src/HTAlert.c:321
+#: src/HTAlert.c:326
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Terbaca %s dari %s dari data"
 
-#: src/HTAlert.c:330
+#: src/HTAlert.c:335
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/detik"
 
-#: src/HTAlert.c:342
+#: src/HTAlert.c:347
 #, c-format
 msgid " (stalled for %s)"
 msgstr " (berhenti untuk %s)"
 
-#: src/HTAlert.c:346
+#: src/HTAlert.c:351
 #, c-format
 msgid ", ETA %s"
 msgstr ", ETA %s"
 
-#: src/HTAlert.c:368
+#: src/HTAlert.c:373
 msgid " (Press 'z' to abort)"
 msgstr " (Tekan 'z' untuk membatalkan)"
 
@@ -3573,11 +3597,11 @@
 #. * Lynx will also accept y Y n N as responses unless there is a conflict
 #. * with the first letter of the "yes" or "no" translation.
 #.
-#: src/HTAlert.c:406 src/HTAlert.c:454
+#: src/HTAlert.c:411 src/HTAlert.c:459
 msgid "yes"
 msgstr "ya"
 
-#: src/HTAlert.c:409 src/HTAlert.c:455
+#: src/HTAlert.c:414 src/HTAlert.c:460
 msgid "no"
 msgstr "tidak"
 
@@ -3597,35 +3621,35 @@
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:911
+#: src/HTAlert.c:913
 msgid "Y/N/A/V"
 msgstr "Y/N/A/V"
 
-#: src/HTML.c:5912
+#: src/HTML.c:5915
 msgid "Description:"
 msgstr "Deskripsi:"
 
-#: src/HTML.c:5917
+#: src/HTML.c:5920
 msgid "(none)"
 msgstr "(kosong)"
 
-#: src/HTML.c:5921
+#: src/HTML.c:5924
 msgid "Filepath:"
 msgstr "Jalur berkas:"
 
-#: src/HTML.c:5927
+#: src/HTML.c:5930
 msgid "(unknown)"
 msgstr "(tidak diketahui)"
 
-#: src/HTML.c:7352
+#: src/HTML.c:7370
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokumen hanya memiliki link tersembunyi. Gunakan perintah l."
 
-#: src/HTML.c:7851
+#: src/HTML.c:7869
 msgid "Source cache error - disk full?"
 msgstr "Cache sumber error - disk penuh?"
 
-#: src/HTML.c:7864
+#: src/HTML.c:7882
 msgid "Source cache error - not enough memory!"
 msgstr "Cache sumber error - tidak cukup memori!"
 
@@ -3641,7 +3665,7 @@
 "     bookmark, ini biasanya dengan tombol 'R' tetapi mungkin telah dipetakan\n"
 "     oleh anda atau sistem administrasi anda."
 
-#: src/LYBookmark.c:374
+#: src/LYBookmark.c:376
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3650,7 +3674,7 @@
 "     Anda dapat menghapus link dengan tombol 'R'<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:377
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links using the remove bookmark command.  It is usually\n"
 "     the 'R' key but may have been remapped by you or your system\n"
@@ -3660,7 +3684,7 @@
 "     biasanya tombol 'R' tetapi mungkin telah dipetakan oleh anda atau\n"
 "     sistem administrator anda."
 
-#: src/LYBookmark.c:381
+#: src/LYBookmark.c:383
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3668,7 +3692,7 @@
 "     Berkas ini juga mungkin telah diubah dengan pengubah teks standar\n"
 "     untuk menghapus outdated atau links tidak valid, atau mengubah urutannya."
 
-#: src/LYBookmark.c:384
+#: src/LYBookmark.c:386
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3680,12 +3704,12 @@
 "       atau menambahkan markup HTML.\n"
 "       Pastikan link bookmark disimpan sebagai sebuah baris tunggal."
 
-#: src/LYBookmark.c:680
+#: src/LYBookmark.c:684
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Berkas mungkin dapat direkover dari %s selama sesi ini"
 
-#: src/LYCgi.c:161
+#: src/LYCgi.c:158
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Anda ingin menjalankan \"%s\"?"
@@ -3694,23 +3718,23 @@
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:276
+#: src/LYCgi.c:273
 msgid "Unable to access cgi script"
 msgstr "Tidak dapat mengakses script cgi"
 
-#: src/LYCgi.c:701 src/LYCgi.c:704
+#: src/LYCgi.c:707 src/LYCgi.c:710
 msgid "Good Advice"
 msgstr "Saran Baik"
 
-#: src/LYCgi.c:708
+#: src/LYCgi.c:714
 msgid "An excellent http server for VMS is available via"
 msgstr "Sebuah server https sempurna untuk VMS tesedia melalui"
 
-#: src/LYCgi.c:715
+#: src/LYCgi.c:721
 msgid "this link"
 msgstr "link ini"
 
-#: src/LYCgi.c:719
+#: src/LYCgi.c:725
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Ini menyediakan dukungan CGI script terbaik.\n"
 
@@ -3718,47 +3742,47 @@
 msgid "Exiting via interrupt:"
 msgstr "Keluar melalui interupsi:"
 
-#: src/LYCookie.c:2477
+#: src/LYCookie.c:2537
 msgid "(from a previous session)"
 msgstr "(daeri sebuah sesi sebelumnya)"
 
-#: src/LYCookie.c:2538
+#: src/LYCookie.c:2598
 msgid "Maximum Gobble Date:"
 msgstr "Maksimal Tanggal Gobble:"
 
-#: src/LYCookie.c:2577
+#: src/LYCookie.c:2637
 msgid "Internal"
 msgstr "Internal"
 
-#: src/LYCookie.c:2578
+#: src/LYCookie.c:2638
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set error, membatalkan aplikasi"
 
-#: src/LYCurses.c:1088
+#: src/LYCurses.c:1297
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Inisialisasi terminal gagal - tipe terminal tidak diketahui?"
 
-#: src/LYCurses.c:1546
+#: src/LYCurses.c:1780
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1550
+#: src/LYCurses.c:1784
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Anda harus menggunakan sebuah vt100, 200, etc. terminal dengan aplikasi ini."
 
-#: src/LYCurses.c:1599
+#: src/LYCurses.c:1833
 msgid "Your Terminal type is unknown!"
 msgstr "Tipe terminal anda tidak diketahui!"
 
-#: src/LYCurses.c:1600
+#: src/LYCurses.c:1834
 msgid "Enter a terminal type:"
 msgstr "Masukan sebuah tipe terminal:"
 
-#: src/LYCurses.c:1614
+#: src/LYCurses.c:1848
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TIPE TERMINAL DISET KE"
 
-#: src/LYCurses.c:2127
+#: src/LYCurses.c:2398
 #, c-format
 msgid ""
 "\n"
@@ -3767,7 +3791,7 @@
 "\n"
 "Sebuah Fatal error telah terjadi dalam %s Ver. %s\n"
 
-#: src/LYCurses.c:2130
+#: src/LYCurses.c:2401
 #, c-format
 msgid ""
 "\n"
@@ -3784,480 +3808,472 @@
 "menyebabkan masalah, nama sistem operasi dengan nomor versi, implementasi\n"
 "TCPIP, TRACKBACK jika ini dapat ditangkap, dan informasi lain yang berhubungan.\n"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:272
 #, c-format
 msgid "Error starting editor, %s"
 msgstr "Error memulai pengubah, %s"
 
-#: src/LYEdit.c:269
+#: src/LYEdit.c:275
 msgid "Editor killed by signal"
 msgstr "Pengubah dihentikan oleh sinyal"
 
-#: src/LYEdit.c:274
+#: src/LYEdit.c:280
 #, c-format
 msgid "Editor returned with error status %s"
 msgstr "Pengubah kembali dengan status error %s"
 
-#: src/LYDownload.c:506
+#: src/LYDownload.c:509
 msgid "Downloaded link:"
 msgstr "Link terunduh:"
 
-#: src/LYDownload.c:511
+#: src/LYDownload.c:514
 msgid "Suggested file name:"
 msgstr "Nama berkas yang disarankan:"
 
-#: src/LYDownload.c:516
+#: src/LYDownload.c:519
 msgid "Standard download options:"
 msgstr "Opsi unduh standar:"
 
-#: src/LYDownload.c:517
+#: src/LYDownload.c:520
 msgid "Download options:"
 msgstr "Opsi unduh:"
 
-#: src/LYDownload.c:533
+#: src/LYDownload.c:536
 msgid "Save to disk"
 msgstr "Simpan ke disk"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:550
 msgid "View temporary file"
 msgstr "Lihat berkas sementara"
 
-#: src/LYDownload.c:554
+#: src/LYDownload.c:557
 msgid "Save to disk disabled."
 msgstr "Simpan ke disk tidak aktif."
 
-#: src/LYDownload.c:558 src/LYPrint.c:1310
+#: src/LYDownload.c:561 src/LYPrint.c:1322
 msgid "Local additions:"
 msgstr "Penambahan lokal:"
 
-#: src/LYDownload.c:569 src/LYUpload.c:211
+#: src/LYDownload.c:572 src/LYUpload.c:209
 msgid "No Name Given"
 msgstr "Tidak ada nama yang diberikan"
 
-#: src/LYHistory.c:672
+#: src/LYHistory.c:679
 msgid "You selected:"
 msgstr "Pilihan anda:"
 
-#: src/LYHistory.c:696 src/LYHistory.c:925
+#: src/LYHistory.c:703 src/LYHistory.c:932
 msgid "(no address)"
 msgstr "(tidak ada alamat)"
 
-#: src/LYHistory.c:700
+#: src/LYHistory.c:707
 msgid " (internal)"
 msgstr " (internal)"
 
-#: src/LYHistory.c:702
+#: src/LYHistory.c:709
 msgid " (was internal)"
 msgstr " (adalah internal)"
 
-#: src/LYHistory.c:800
+#: src/LYHistory.c:807
 msgid " (From History)"
 msgstr " (Dari Sejarah)"
 
-#: src/LYHistory.c:845
+#: src/LYHistory.c:852
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Anda telah mengunjungi (POST, bookmark, menu dan daftar berkas diabaikan):"
 
-#: src/LYHistory.c:1138
+#: src/LYHistory.c:1154
 msgid "(No messages yet)"
 msgstr "(Belum ada pesan)"
 
-#: src/LYLeaks.c:220
+#: src/LYLeaks.c:222
 msgid "Invalid pointer detected."
 msgstr "Penunjuk tidak valid terdeteksi."
 
-#: src/LYLeaks.c:222 src/LYLeaks.c:260
+#: src/LYLeaks.c:224 src/LYLeaks.c:262
 msgid "Sequence:"
 msgstr "Urutan:"
 
-#: src/LYLeaks.c:225 src/LYLeaks.c:263
+#: src/LYLeaks.c:227 src/LYLeaks.c:265
 msgid "Pointer:"
 msgstr "Penunjuk:"
 
-#: src/LYLeaks.c:234 src/LYLeaks.c:241 src/LYLeaks.c:282
+#: src/LYLeaks.c:236 src/LYLeaks.c:243 src/LYLeaks.c:284
 msgid "FileName:"
 msgstr "Nama Berkas:"
 
-#: src/LYLeaks.c:237 src/LYLeaks.c:244 src/LYLeaks.c:285 src/LYLeaks.c:296
+#: src/LYLeaks.c:239 src/LYLeaks.c:246 src/LYLeaks.c:287 src/LYLeaks.c:298
 msgid "LineCount:"
 msgstr "Jumlah Baris:"
 
-#: src/LYLeaks.c:258
+#: src/LYLeaks.c:260
 msgid "Memory leak detected."
 msgstr "Kebocoran memori terdeteksi."
 
-#: src/LYLeaks.c:266
+#: src/LYLeaks.c:268
 msgid "Contains:"
 msgstr "Berisi:"
 
-#: src/LYLeaks.c:279
+#: src/LYLeaks.c:281
 msgid "ByteSize:"
 msgstr "Ukuran Byte:"
 
-#: src/LYLeaks.c:293
+#: src/LYLeaks.c:295
 msgid "realloced:"
 msgstr "realokasi:"
 
-#: src/LYLeaks.c:314
+#: src/LYLeaks.c:316
 msgid "Total memory leakage this run:"
 msgstr "Total kebocoran memori saat ini:"
 
-#: src/LYLeaks.c:317
+#: src/LYLeaks.c:320
 msgid "Peak allocation"
 msgstr "Puncak alokasi"
 
-#: src/LYLeaks.c:318
+#: src/LYLeaks.c:322
 msgid "Bytes allocated"
 msgstr "Byte alokasi"
 
-#: src/LYLeaks.c:319
+#: src/LYLeaks.c:324
 msgid "Total mallocs"
 msgstr "Total mallocs"
 
-#: src/LYLeaks.c:320
+#: src/LYLeaks.c:326
 msgid "Total frees"
 msgstr "Total frees"
 
-#: src/LYList.c:84
+#: src/LYList.c:88
 msgid "References in "
 msgstr "References dalam "
 
-#: src/LYList.c:87
+#: src/LYList.c:91
 msgid "this document:"
 msgstr "dokumen ini:"
 
-#: src/LYList.c:93
+#: src/LYList.c:97
 msgid "Visible links:"
 msgstr "Sambungan yang terlihat:"
 
-#: src/LYList.c:194 src/LYList.c:295
+#: src/LYList.c:201 src/LYList.c:312
 msgid "Hidden links:"
 msgstr "Sambungan tersembunyi:"
 
-#: src/LYList.c:332
+#: src/LYList.c:349
 msgid "References"
 msgstr "Referensi"
 
-#: src/LYList.c:336
+#: src/LYList.c:353
 msgid "Visible links"
 msgstr "Sambungan terlihat"
 
-#: src/LYLocal.c:271
+#: src/LYLocal.c:289
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Tidak dapat memperoleh status dari '%s'."
 
-#: src/LYLocal.c:305
+#: src/LYLocal.c:354
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Item yang dipilih bukan sebuah berkas atau sebuah direktori! Permintaan ditolak."
 
-#: src/LYLocal.c:373
+#: src/LYLocal.c:455
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Tidak dapat ke %s karena sistem error!"
 
-#: src/LYLocal.c:407
+#: src/LYLocal.c:489
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Mungkin gagal ke %s karena sistem error!"
 
-#: src/LYLocal.c:469 src/LYLocal.c:490
+#: src/LYLocal.c:554 src/LYLocal.c:577
 #, c-format
 msgid "remove %s"
 msgstr "hapus %s"
 
-#: src/LYLocal.c:508
+#: src/LYLocal.c:597
 #, c-format
 msgid "touch %s"
 msgstr "sentuh %s"
 
-#: src/LYLocal.c:536
+#: src/LYLocal.c:627
 #, c-format
 msgid "move %s to %s"
 msgstr "pindahkan %s ke %s"
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:675
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Telah ada sebuah direktori dengan nama itu! Permintaan diabaikan."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:677
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Telah ada sebuah berkas dengan nama itu! Permintaan diabaikan."
 
-#: src/LYLocal.c:581
+#: src/LYLocal.c:679
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Nama yang dispesifikasikan telah digunakan! Permintaan diabaikan."
 
-#: src/LYLocal.c:592
+#: src/LYLocal.c:691
 msgid "Destination has different owner!  Request denied."
 msgstr "Tujuan memiliki pemilik yang berbeda! Permintaan ditolak."
 
-#: src/LYLocal.c:595
+#: src/LYLocal.c:694
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Tujuan bukan sebuah direktori yang  valid! Permintaan ditolak."
 
-#: src/LYLocal.c:617
+#: src/LYLocal.c:710
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr "Sumber dan tujuan berada dilokasi yang sama! Permintaan diabaikan!"
+
+#: src/LYLocal.c:734
 msgid "Remove all tagged files and directories?"
 msgstr "Hapus  seluruh berkas tagged dan direktori!"
 
-#: src/LYLocal.c:675
+#: src/LYLocal.c:807
 msgid "Enter new location for tagged items: "
 msgstr "Masukan lokasi baru untuk tagged items: "
 
-#: src/LYLocal.c:745
-msgid "Path too long"
-msgstr "Jalur terlalu panjang"
-
-#: src/LYLocal.c:776
-msgid "Source and destination are the same location - request ignored!"
-msgstr "Sumber dan tujuan berada dilokasi yang sama - permintaan diabaikan!"
-
-#: src/LYLocal.c:833
+#: src/LYLocal.c:905
 msgid "Enter new name for directory: "
 msgstr "Masukan nama baru untuk direktori: "
 
-#: src/LYLocal.c:835
+#: src/LYLocal.c:907
 msgid "Enter new name for file: "
 msgstr "Masukan nama baru untuk berkas: "
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:919
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Karakter tidak legal (pemisah-jalur) ditemukan! Permintaan diabaikan."
 
-#: src/LYLocal.c:897
+#: src/LYLocal.c:969
 msgid "Enter new location for directory: "
 msgstr "Masukan lokasi baru untuk direktori: "
 
-#: src/LYLocal.c:903
+#: src/LYLocal.c:971
 msgid "Enter new location for file: "
 msgstr "Masukan lokasi baru untuk berkas: "
 
-#: src/LYLocal.c:930
+#: src/LYLocal.c:998
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Kegagalan tidak terduga - tidak dapat menemukan akhiran jalur pemisah"
 
-#: src/LYLocal.c:950
-msgid "Source and destination are the same location!  Request ignored!"
-msgstr "Sumber dan tujuan berada dilokasi yang sama! Permintaan diabaikan!"
-
-#: src/LYLocal.c:997
+#: src/LYLocal.c:1060
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modifikasi nama, lokasi, atau ijin (n, l, atau p): "
 
-#: src/LYLocal.c:999
+#: src/LYLocal.c:1062
 msgid "Modify name or location (n or l): "
 msgstr "Modifikasi nama atau lokasi (n atau l):"
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1028
+#: src/LYLocal.c:1091
 msgid "This feature not yet implemented!"
 msgstr "Fitur ini belum diimplementasikan!"
 
-#: src/LYLocal.c:1048
+#: src/LYLocal.c:1112
 msgid "Enter name of file to create: "
 msgstr "Masukan nama dari berkas untuk dibuat: "
 
-#: src/LYLocal.c:1052 src/LYLocal.c:1088
+#: src/LYLocal.c:1115 src/LYLocal.c:1152
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Redireksi \"//\" tidak legal ditemukan! Permintaan diabaikan."
 
-#: src/LYLocal.c:1084
+#: src/LYLocal.c:1149
 msgid "Enter name for new directory: "
 msgstr "Masukan nama untuk direktori baru: "
 
-#: src/LYLocal.c:1124
+#: src/LYLocal.c:1190
 msgid "Create file or directory (f or d): "
 msgstr "Buat berkas atau direktori (f atau d): "
 
-#: src/LYLocal.c:1166
+#: src/LYLocal.c:1232
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Hapus direktori '%s'?"
 
-#: src/LYLocal.c:1169
+#: src/LYLocal.c:1235
 msgid "Remove directory?"
 msgstr "Hapus direktori?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1240
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Hapus berkas '%s'?"
 
-#: src/LYLocal.c:1176
+#: src/LYLocal.c:1242
 msgid "Remove file?"
 msgstr "Hapus berkas?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1247
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Hapus sambungan simbolik '%s'?"
 
-#: src/LYLocal.c:1183
+#: src/LYLocal.c:1249
 msgid "Remove symbolic link?"
 msgstr "Hapus sambungan simbolik?"
 
-#: src/LYLocal.c:1278
+#: src/LYLocal.c:1347
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Maaf, tidak tahu bagaimana mengijinkan berkas bukan UNIX."
 
-#: src/LYLocal.c:1308
+#: src/LYLocal.c:1376
 msgid "Unable to open permit options file"
 msgstr "Tidak dapat membuka opsi ijin berkas"
 
-#: src/LYLocal.c:1338
+#: src/LYLocal.c:1404
 msgid "Specify permissions below:"
 msgstr "Spesifikasikan ijin dibawah:"
 
-#: src/LYLocal.c:1339 src/LYShowInfo.c:261
+#: src/LYLocal.c:1405 src/LYShowInfo.c:265
 msgid "Owner:"
 msgstr "Pemilik:"
 
-#: src/LYLocal.c:1355
+#: src/LYLocal.c:1421
 msgid "Group"
 msgstr "Grup"
 
-#: src/LYLocal.c:1371
+#: src/LYLocal.c:1437
 msgid "Others:"
 msgstr "Lain:"
 
-#: src/LYLocal.c:1389
+#: src/LYLocal.c:1455
 msgid "form to permit"
 msgstr "formulir untuk ijin"
 
-#: src/LYLocal.c:1484
+#: src/LYLocal.c:1551
 msgid "Invalid mode format."
 msgstr "Format mode tidak valid."
 
-#: src/LYLocal.c:1488
+#: src/LYLocal.c:1555
 msgid "Invalid syntax format."
 msgstr "Format sintaks tidak valid."
 
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1742
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Peringatan! UUDecoded berkas akan ada dalam direktori dimana anda memulai Lynx."
 
-#: src/LYLocal.c:1860
+#: src/LYLocal.c:1932
 msgid "NULL URL pointer"
 msgstr "Penunjuk URL KOSONG"
 
-#: src/LYLocal.c:1942
+#: src/LYLocal.c:2014
 #, c-format
 msgid "Executing %s "
 msgstr "Menjalankan %s "
 
-#: src/LYLocal.c:1945
+#: src/LYLocal.c:2017
 msgid "Executing system command. This might take a while."
 msgstr "Menjalankan perintah sistem. Ini mungkin membutuhkan waktu beberapa saat."
 
-#: src/LYLocal.c:2017
+#: src/LYLocal.c:2091
 msgid "Current directory:"
 msgstr "Direktori saat ini:"
 
-#: src/LYLocal.c:2020 src/LYLocal.c:2038
+#: src/LYLocal.c:2094 src/LYLocal.c:2112
 msgid "Current selection:"
 msgstr "Pemilihaan saat ini:"
 
-#: src/LYLocal.c:2024
+#: src/LYLocal.c:2098
 msgid "Nothing currently selected."
 msgstr "Tidak ada yang dipilih saat ini."
 
-#: src/LYLocal.c:2040
+#: src/LYLocal.c:2114
 msgid "tagged item:"
 msgstr "tagged item:"
 
-#: src/LYLocal.c:2041
+#: src/LYLocal.c:2115
 msgid "tagged items:"
 msgstr "tagged item:"
 
-#: src/LYLocal.c:2138 src/LYLocal.c:2149
+#: src/LYLocal.c:2215 src/LYLocal.c:2224
 msgid "Illegal filename; request ignored."
 msgstr "Nama berkas tidak legal; permintaan diabaikan."
 
 #. directory not writable
-#: src/LYLocal.c:2247 src/LYLocal.c:2306
+#: src/LYLocal.c:2322 src/LYLocal.c:2381
 msgid "Install in the selected directory not permitted."
 msgstr "Pemasangan di direktori yang dipilih tidak diijinkan."
 
-#: src/LYLocal.c:2302
+#: src/LYLocal.c:2377
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Item yang dipilih bukan sebuah direktori! Permintaan diabaikan."
 
-#: src/LYLocal.c:2311
+#: src/LYLocal.c:2386
 msgid "Just a moment, ..."
 msgstr "Tunggu sebentar, ..."
 
-#: src/LYLocal.c:2328
+#: src/LYLocal.c:2403
 msgid "Error building install args"
 msgstr "Error membuat args pemasangan"
 
-#: src/LYLocal.c:2343 src/LYLocal.c:2374
+#: src/LYLocal.c:2418 src/LYLocal.c:2449
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Sumber dan target sama: %s"
 
-#: src/LYLocal.c:2350 src/LYLocal.c:2381
+#: src/LYLocal.c:2425 src/LYLocal.c:2456
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Telah berada dalam target direktori: %s"
 
-#: src/LYLocal.c:2399
+#: src/LYLocal.c:2474
 msgid "Installation complete"
 msgstr "Pemasangan lengkap"
 
-#: src/LYLocal.c:2586
+#: src/LYLocal.c:2666
 msgid "Temporary URL or list would be too long."
 msgstr "URL sementara atau daftar akan menjadi terlalu panjang."
 
-#: src/LYMail.c:520
+#: src/LYMail.c:544
 msgid "Sending"
 msgstr "Mengirimkan"
 
-#: src/LYMail.c:1006
+#: src/LYMail.c:1030
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Sambungan  %s :?: %s \n"
 
-#: src/LYMail.c:1008
+#: src/LYMail.c:1032
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "dipanggil \"%s\"\n"
 
-#: src/LYMail.c:1009
+#: src/LYMail.c:1033
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "dalam berkas \"%s\" dipanggil \"%s\"\n"
 
-#: src/LYMail.c:1010
+#: src/LYMail.c:1034
 msgid "was requested but was not available."
 msgstr "telah diminta tetapi tidak tersedia."
 
-#: src/LYMail.c:1011
+#: src/LYMail.c:1035
 msgid "Thought you might want to know."
 msgstr "Dikira anda mungkin ingin mengetahui."
 
-#: src/LYMail.c:1013
+#: src/LYMail.c:1037
 msgid "This message was automatically generated by"
 msgstr "Pesan ini secara otomatis dibuat oleh"
 
-#: src/LYMail.c:1728
+#: src/LYMail.c:1751
 msgid "No system mailer configured"
 msgstr "Tidak ada pengirim surat sistem yang dikonfigurasikan"
 
-#: src/LYMain.c:1001
+#: src/LYMain.c:1049
 msgid "No Winsock found, sorry."
 msgstr "Tidak ada Winsock ditemukan, maaf."
 
-#: src/LYMain.c:1198
+#: src/LYMain.c:1240
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Anda HARUS mendefinisikan sebuah daerah valid TMP atau TEMP!"
 
-#: src/LYMain.c:1251 src/LYMainLoop.c:5051
+#: src/LYMain.c:1293 src/LYMainLoop.c:5260
 msgid "No such directory"
 msgstr "Tidak ada direktori seperti itu"
 
-#: src/LYMain.c:1436
+#: src/LYMain.c:1487
 #, c-format
 msgid ""
 "\n"
@@ -4268,7 +4284,7 @@
 "Berkas konfigurasi \"%s\" tidak tersedia.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1497
 #, c-format
 msgid ""
 "\n"
@@ -4279,7 +4295,7 @@
 "Karakter set Lynx tidak dideklarasikan.\n"
 "\n"
 
-#: src/LYMain.c:1475
+#: src/LYMain.c:1526
 #, c-format
 msgid ""
 "\n"
@@ -4290,7 +4306,7 @@
 "Lunx peta pengubahan tidak dideklarasikan.\n"
 "\n"
 
-#: src/LYMain.c:1551
+#: src/LYMain.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4301,172 +4317,177 @@
 "Berkas Lynx \"%s\" tidak tersedia.\n"
 "\n"
 
-#: src/LYMain.c:1626
+#: src/LYMain.c:1683
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Diabaikan %d karakter dari standar masukan.\n"
 
-#: src/LYMain.c:1628
+#: src/LYMain.c:1685
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Gunakan \"-stdin\" atatu \"-\" untuk mengetahui bagaimana menangani masukan piped.\n"
 
-#: src/LYMain.c:1776
+#: src/LYMain.c:1843
 msgid "Warning:"
 msgstr "Peringatan:"
 
-#: src/LYMain.c:2341
+#: src/LYMain.c:2408
 msgid "persistent cookies state will be changed in next session only."
 msgstr "persisten keadaan cookies hanya akan berubah di sesi selanjutnya saja."
 
-#: src/LYMain.c:2586 src/LYMain.c:2631
+#: src/LYMain.c:2644 src/LYMain.c:2689
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: mengabaikan charset=%s tidak diketahui\n"
 
-#: src/LYMain.c:3150
+#: src/LYMain.c:3208
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versi %s (%s)"
 
-#: src/LYMain.c:3188
+#: src/LYMain.c:3246
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Dibuat di %s %s %s\n"
 
-#: src/LYMain.c:3210
+#: src/LYMain.c:3268
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Hak Cipta dipegang oleh Lynx Developers Group,"
 
-#: src/LYMain.c:3211
+#: src/LYMain.c:3269
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "the University of Kansas, CERN, dan kontributor lain."
 
-#: src/LYMain.c:3212
+#: src/LYMain.c:3270
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Didistribusikan dibawah GNU General Public License (Version 2)."
 
-#: src/LYMain.c:3213
+#: src/LYMain.c:3271
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Lihat http://lynx.isc.org/ dan bantuan online untuk informasi lebih lanjut."
 
-#: src/LYMain.c:4032
+#: src/LYMain.c:4104
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "PENGGUNAAN: %s [opsi] [berkas]\n"
 
-#: src/LYMain.c:4033
+#: src/LYMain.c:4105
 #, c-format
 msgid "Options are:\n"
 msgstr "Opsi adalah:\n"
 
-#: src/LYMain.c:4332
+#: src/LYMain.c:4406
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Opsi tidak valid: %s\n"
 
-#: src/LYMainLoop.c:571
+#: src/LYMainLoop.c:575
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Internal error: Sambungan mouse tidak valid %d!"
 
-#: src/LYMainLoop.c:691 src/LYMainLoop.c:5073
+#: src/LYMainLoop.c:696 src/LYMainLoop.c:5282
 msgid "A URL specified by the user"
 msgstr "Sebuah URL dispesifikasikan oleh pengguna"
 
-#: src/LYMainLoop.c:1150
+#: src/LYMainLoop.c:1148
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Enctype multipart/form-data belum didukung! Tidak dapat mengirimkan."
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3082
+#: src/LYMainLoop.c:3177
 msgid "Help Screen"
 msgstr "Layar Bantuan"
 
-#: src/LYMainLoop.c:3203
+#: src/LYMainLoop.c:3308
 msgid "System Index"
 msgstr "Indeks Sistem"
 
-#: src/LYMainLoop.c:3562 src/LYMainLoop.c:5297
+#: src/LYMainLoop.c:3556
+#, c-format
+msgid "Query parameter %d: "
+msgstr "Query parameter %d: "
+
+#: src/LYMainLoop.c:3781 src/LYMainLoop.c:5558
 msgid "Entry into main screen"
 msgstr "Masukan ke layar utama"
 
-#: src/LYMainLoop.c:3820
+#: src/LYMainLoop.c:4039
 msgid "No next document present"
 msgstr "Tidak ada dokumen selanjutnya yang ada"
 
-#: src/LYMainLoop.c:4116
+#: src/LYMainLoop.c:4334
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "charset untuk dokumen ini dispesifikasikan secara eksplisit, maaf..."
 
-#: src/LYMainLoop.c:5029
+#: src/LYMainLoop.c:5240
 msgid "cd to:"
 msgstr "cd ke:"
 
-#: src/LYMainLoop.c:5054
+#: src/LYMainLoop.c:5263
 msgid "A component of path is not a directory"
 msgstr "Sebuah komponen dari jalur bukan sebuah direktori"
 
-#: src/LYMainLoop.c:5057
+#: src/LYMainLoop.c:5266
 msgid "failed to change directory"
 msgstr "gagal untuk berpindah direktori"
 
-#: src/LYMainLoop.c:6229
+#: src/LYMainLoop.c:6496
 msgid "Reparsing document under current settings..."
 msgstr "Reparsing dokumen dibawah konfigurasi saat ini..."
 
-#: src/LYMainLoop.c:6521
+#: src/LYMainLoop.c:6790
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatal error - tidak dapat membuka berkas keluaran %s\n"
 
-#: src/LYMainLoop.c:6858
+#: src/LYMainLoop.c:7128
 msgid "TABLE center enable."
 msgstr "pusat TABEL aktif."
 
-#: src/LYMainLoop.c:6861
+#: src/LYMainLoop.c:7131
 msgid "TABLE center disable."
 msgstr "pusat TABEL tidak aktif."
 
-#: src/LYMainLoop.c:6938
+#: src/LYMainLoop.c:7211
 msgid "Current URL is empty."
 msgstr "URL sekarang kosong."
 
-#: src/LYMainLoop.c:6940 src/LYUtils.c:1828
+#: src/LYMainLoop.c:7213 src/LYUtils.c:1881
 msgid "Copy to clipboard failed."
 msgstr "Salin ke clipboard gagal."
 
-#: src/LYMainLoop.c:6942
+#: src/LYMainLoop.c:7215
 msgid "Document URL put to clipboard."
 msgstr "URL dokumen diletakan ke clipboard."
 
-#: src/LYMainLoop.c:6944
+#: src/LYMainLoop.c:7217
 msgid "Link URL put to clipboard."
 msgstr "Sambungan URL diletakan ke clipboard."
 
-#: src/LYMainLoop.c:6971
+#: src/LYMainLoop.c:7244
 msgid "No URL in the clipboard."
 msgstr "Tidak ada URL dalam clipboard."
 
-#: src/LYMainLoop.c:7642 src/LYMainLoop.c:7812
+#: src/LYMainLoop.c:7936 src/LYMainLoop.c:8105
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7752
+#: src/LYMainLoop.c:8045
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Tidak dapat mengakses startfile"
 
-#: src/LYMainLoop.c:7764
+#: src/LYMainLoop.c:8057
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Start file tidak dapat ditemukana atau bukan teks/html atau teks/plain"
 
-#: src/LYMainLoop.c:7765
+#: src/LYMainLoop.c:8058
 msgid "      Exiting..."
 msgstr "      Keluar..."
 
-#: src/LYMainLoop.c:7806
+#: src/LYMainLoop.c:8099
 msgid "-more-"
 msgstr "-lebih-"
 
@@ -4530,132 +4551,149 @@
 msgid "Message has no original text!"
 msgstr "Pesan tidak memiliki teks asli!"
 
-#: src/LYOptions.c:768
+#: src/LYOptions.c:770
 msgid "review/edit B)ookmarks files"
 msgstr "ulas/ubah berkas B)ookmarks"
 
-#: src/LYOptions.c:770
+#: src/LYOptions.c:772
 msgid "B)ookmark file: "
 msgstr "berkas B)ookmark: "
 
-#: src/LYOptions.c:2131 src/LYOptions.c:2138
+#: src/LYOptions.c:2120 src/LYOptions.c:2127
 msgid "ON"
 msgstr "ON"
 
 #. verbose_img variable
-#: src/LYOptions.c:2132 src/LYOptions.c:2137 src/LYOptions.c:2289 src/LYOptions.c:2300
+#: src/LYOptions.c:2121 src/LYOptions.c:2126 src/LYOptions.c:2289
+#: src/LYOptions.c:2300
 msgid "OFF"
 msgstr "OFF"
 
-#: src/LYOptions.c:2133
+#: src/LYOptions.c:2122
 msgid "NEVER"
 msgstr "NEVER"
 
-#: src/LYOptions.c:2134
+#: src/LYOptions.c:2123
 msgid "ALWAYS"
 msgstr "SELALU"
 
-#: src/LYOptions.c:2150 src/LYOptions.c:2281
+#: src/LYOptions.c:2139 src/LYOptions.c:2281
 msgid "ignore"
 msgstr "abaikan"
 
-#: src/LYOptions.c:2151
+#: src/LYOptions.c:2140
 msgid "ask user"
 msgstr "tanya pengguna"
 
-#: src/LYOptions.c:2152
+#: src/LYOptions.c:2141
 msgid "accept all"
 msgstr "terima semua"
 
-#: src/LYOptions.c:2164
+#: src/LYOptions.c:2153
 msgid "ALWAYS OFF"
 msgstr "SELALU OFF"
 
-#: src/LYOptions.c:2165
+#: src/LYOptions.c:2154
 msgid "FOR LOCAL FILES ONLY"
 msgstr "UNTUK BERKAS LOKAL SAJA"
 
-#: src/LYOptions.c:2167
+#: src/LYOptions.c:2156
 msgid "ALWAYS ON"
 msgstr "SELALU ON"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2168
 msgid "Numbers act as arrows"
 msgstr "Angka berlaku sebagai panah"
 
-#: src/LYOptions.c:2181
+#: src/LYOptions.c:2170
 msgid "Links are numbered"
 msgstr "Sambungan dinomori"
 
-#: src/LYOptions.c:2184
+#: src/LYOptions.c:2173
 msgid "Links and form fields are numbered"
 msgstr "Sambungan dan daerah formulir dinomori"
 
-#: src/LYOptions.c:2187
+#: src/LYOptions.c:2176
 msgid "Form fields are numbered"
 msgstr "Daerah formulir dinomori"
 
-#: src/LYOptions.c:2201
+#: src/LYOptions.c:2191
 msgid "Case insensitive"
 msgstr "Tidak memperhatikan besar huruf"
 
-#: src/LYOptions.c:2202
+#: src/LYOptions.c:2192
 msgid "Case sensitive"
 msgstr "Memperhatikan besar huruf"
 
-#: src/LYOptions.c:2226
+#: src/LYOptions.c:2216
 msgid "prompt normally"
 msgstr "tanya secara manual"
 
-#: src/LYOptions.c:2227
+#: src/LYOptions.c:2217
 msgid "force yes-response"
 msgstr "paksa balasan ya"
 
-#: src/LYOptions.c:2228
+#: src/LYOptions.c:2218
 msgid "force no-response"
 msgstr "paksa balasan tidak"
 
-#: src/LYOptions.c:2246
+#: src/LYOptions.c:2236
 msgid "Novice"
 msgstr "Pemula"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2237
 msgid "Intermediate"
 msgstr "Menengah"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2238
 msgid "Advanced"
 msgstr "Ahli"
 
-#: src/LYOptions.c:2257
+#: src/LYOptions.c:2247
 msgid "By First Visit"
 msgstr "Dengan Kunjungan Pertama"
 
-#: src/LYOptions.c:2259
+#: src/LYOptions.c:2249
 msgid "By First Visit Reversed"
 msgstr "Dengan Kunjungan Pertama dibalik"
 
-#: src/LYOptions.c:2260
+#: src/LYOptions.c:2250
 msgid "As Visit Tree"
 msgstr "Sebagai Pohon Pengunjung"
 
-#: src/LYOptions.c:2261
+#: src/LYOptions.c:2251
 msgid "By Last Visit"
 msgstr "Dengan Kunjungan Terakhir"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2253
 msgid "By Last Visit Reversed"
 msgstr "Dengan Kunjungan Terakhir Dibalik"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2274
+#: src/LYOptions.c:2264
 msgid "relaxed (TagSoup mode)"
 msgstr "relaxed (mode TagSoup)"
 
-#: src/LYOptions.c:2275
+#: src/LYOptions.c:2265
 msgid "strict (SortaSGML mode)"
 msgstr "strict (mode SortaSGML)"
 
+#: src/LYOptions.c:2272
+msgid "Ignore"
+msgstr "abaikan"
+
+#: src/LYOptions.c:2273
+msgid "Add to trace-file"
+msgstr "Add to trace-file"
+
+#: src/LYOptions.c:2274
+msgid "Add to LYNXMESSAGES"
+msgstr "Add to LYNXMESSAGES"
+
+#: src/LYOptions.c:2275
+msgid "Warn, point to trace-file"
+msgstr "Menunjuk ke berkas:"
+
 #: src/LYOptions.c:2282
 msgid "as labels"
 msgstr "sebagai labels"
@@ -4676,202 +4714,206 @@
 msgid "ADVANCED"
 msgstr "ADVANCED"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2336
 msgid "Directories first"
 msgstr "Direktori dahulu"
 
-#: src/LYOptions.c:2334
+#: src/LYOptions.c:2337
 msgid "Files first"
 msgstr "Berkas dahulu"
 
-#: src/LYOptions.c:2335
+#: src/LYOptions.c:2338
 msgid "Mixed style"
 msgstr "Gaya campur"
 
-#: src/LYOptions.c:2343 src/LYOptions.c:2363
+#: src/LYOptions.c:2346 src/LYOptions.c:2366
 msgid "By Name"
 msgstr "Dengan Nama"
 
-#: src/LYOptions.c:2344 src/LYOptions.c:2364
+#: src/LYOptions.c:2347 src/LYOptions.c:2367
 msgid "By Type"
 msgstr "Dengan Tipe"
 
-#: src/LYOptions.c:2345 src/LYOptions.c:2365
+#: src/LYOptions.c:2348 src/LYOptions.c:2368
 msgid "By Size"
 msgstr "Dengan Ukuran"
 
-#: src/LYOptions.c:2346 src/LYOptions.c:2366
+#: src/LYOptions.c:2349 src/LYOptions.c:2369
 msgid "By Date"
 msgstr "Dengan Tanggal"
 
-#: src/LYOptions.c:2347
+#: src/LYOptions.c:2350
 msgid "By Mode"
 msgstr "Dengan Mode"
 
-#: src/LYOptions.c:2349
+#: src/LYOptions.c:2352
 msgid "By User"
 msgstr "Dengan Pengguna"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2353
 msgid "By Group"
 msgstr "Dengan Grup"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "Do not show rate"
 msgstr "Jangan tampilkan kecepatan"
 
-#: src/LYOptions.c:2376 src/LYOptions.c:2377
+#: src/LYOptions.c:2379 src/LYOptions.c:2380
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Tampilkan kecepatan %s/detik"
 
-#: src/LYOptions.c:2379 src/LYOptions.c:2380
+#: src/LYOptions.c:2382 src/LYOptions.c:2383
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Tampilkan ETA %s/detik"
 
-#: src/LYOptions.c:2383
+#: src/LYOptions.c:2386
 msgid "Show progressbar"
 msgstr "Tampilkan bar perkembangan"
 
-#: src/LYOptions.c:2395
+#: src/LYOptions.c:2398
 msgid "Accept lynx's internal types"
 msgstr "Terima tipe internal lynx"
 
-#: src/LYOptions.c:2396
+#: src/LYOptions.c:2399
 msgid "Also accept lynx.cfg's types"
 msgstr "Juga terima tipe lynx.cfg"
 
-#: src/LYOptions.c:2397
+#: src/LYOptions.c:2400
 msgid "Also accept user's types"
 msgstr "Juga terima tipe pengguna"
 
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2401
 msgid "Also accept system's types"
 msgstr "Juga terima tipe sistem"
 
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2402
 msgid "Accept all types"
 msgstr "Terima semua tipe"
 
-#: src/LYOptions.c:2408
+#: src/LYOptions.c:2411
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2409
+#: src/LYOptions.c:2412
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2412
+#: src/LYOptions.c:2415
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2418
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2417
+#: src/LYOptions.c:2420
 msgid "All"
 msgstr "Semua"
 
-#: src/LYOptions.c:2685 src/LYOptions.c:2709
+#: src/LYOptions.c:2699 src/LYOptions.c:2728
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Gunakan %s untuk menjalankan Opsi menu!"
 
-#: src/LYOptions.c:3481
+#: src/LYOptions.c:3541
 msgid "(options marked with (!) will not be saved)"
 msgstr "(opsi ditandai dengan (!) tidak akan disimpan)"
 
-#: src/LYOptions.c:3489
+#: src/LYOptions.c:3549
 msgid "General Preferences"
 msgstr "Kesukaan Umum"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3493
+#: src/LYOptions.c:3553
 msgid "User mode"
 msgstr "Mode pengguna"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3499
+#: src/LYOptions.c:3559
 msgid "Editor"
 msgstr "Pengubah"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3564
 msgid "Type of Search"
 msgstr "Tipe Pencarian"
 
-#: src/LYOptions.c:3509
+#: src/LYOptions.c:3569
 msgid "Security and Privacy"
 msgstr "Keamanan dan Privasi"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3513
+#: src/LYOptions.c:3573
 msgid "Cookies"
 msgstr "Cookies"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3527
+#: src/LYOptions.c:3587
 msgid "Invalid-Cookie Prompting"
 msgstr "Tanya Cookie Tidak valid"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3534
+#: src/LYOptions.c:3594
 msgid "SSL Prompting"
 msgstr "Tanya SSL"
 
-#: src/LYOptions.c:3540
+#: src/LYOptions.c:3600
 msgid "Keyboard Input"
 msgstr "Masukan Keyboard"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3544
+#: src/LYOptions.c:3604
 msgid "Keypad mode"
 msgstr "Mode Keypad"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3550
+#: src/LYOptions.c:3610
 msgid "Emacs keys"
 msgstr "Tombol Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3556
+#: src/LYOptions.c:3616
 msgid "VI keys"
 msgstr "Tombol VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3563
+#: src/LYOptions.c:3623
 msgid "Line edit style"
 msgstr "Gaya pengubahan baris"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3575
+#: src/LYOptions.c:3635
 msgid "Keyboard layout"
 msgstr "Layout keyboard"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3589
+#: src/LYOptions.c:3649
 msgid "Display and Character Set"
 msgstr "Layar dan Set Karakter"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3594
+#: src/LYOptions.c:3654
 msgid "Use locale-based character set"
 msgstr "Gunakan Set Karakter berbasis lokal"
 
+#: src/LYOptions.c:3661
+msgid "Use HTML5 charset replacements"
+msgstr "Use HTML5 charset replacements"
+
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3603
+#: src/LYOptions.c:3667
 msgid "Display character set"
 msgstr "Karakter Set Penampilan"
 
-#: src/LYOptions.c:3634
+#: src/LYOptions.c:3698
 msgid "Assumed document character set"
 msgstr "Asumsikan karakter set dokumen"
 
@@ -4880,250 +4922,267 @@
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3718
 msgid "CJK mode"
 msgstr "mode CJK"
 
-#: src/LYOptions.c:3656
+#: src/LYOptions.c:3720
 msgid "Raw 8-bit"
 msgstr "Raw 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3664
+#: src/LYOptions.c:3728
 msgid "X Display"
 msgstr "Tampilan X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3670
+#: src/LYOptions.c:3734
 msgid "Document Appearance"
 msgstr "Tampilan Dokumen"
 
-#: src/LYOptions.c:3676
+#: src/LYOptions.c:3740
 msgid "Show color"
 msgstr "Tampilkan warna"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3700
+#: src/LYOptions.c:3764
 msgid "Show cursor"
 msgstr "Tampilkan cursor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3706
+#: src/LYOptions.c:3770
 msgid "Underline links"
 msgstr "Garis bawah sambungan"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3713
+#: src/LYOptions.c:3777
 msgid "Show scrollbar"
 msgstr "Tampilkan scrollbar"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3784
 msgid "Popups for select fields"
 msgstr "Popups untuk daerah yang dipilih"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3726
+#: src/LYOptions.c:3790
 msgid "HTML error recovery"
 msgstr "HTML error rekoveri"
 
+#. Bad HTML messages: SELECT
+#: src/LYOptions.c:3796
+msgid "Bad HTML messages"
+msgstr "Bad HTML messages"
+
 #. Show Images: SELECT
-#: src/LYOptions.c:3732
+#: src/LYOptions.c:3802
 msgid "Show images"
 msgstr "Tampilkan gambar"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3746
+#: src/LYOptions.c:3816
 msgid "Verbose images"
 msgstr "Verbose gambar"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3754
+#: src/LYOptions.c:3824
 msgid "Headers Transferred to Remote Servers"
 msgstr "Headers ditransfer ke Server Remote"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3758
+#: src/LYOptions.c:3828
 msgid "Personal mail address"
 msgstr "Alamat surat pribadi"
 
-#: src/LYOptions.c:3764
+#: src/LYOptions.c:3833
+msgid "Personal name for mail"
+msgstr "Masukan nama baru untuk berkas: "
+
+#: src/LYOptions.c:3840
 msgid "Password for anonymous ftp"
 msgstr "Kata sandi untuk ftp anonim"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3770
+#: src/LYOptions.c:3846
 msgid "Preferred media type"
 msgstr "Tipe media yang disukai"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3776
+#: src/LYOptions.c:3852
 msgid "Preferred encoding"
 msgstr "Pengkodean yang disukai"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3858
 msgid "Preferred document character set"
 msgstr "Set Karakter dokumen yang disukai"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3787
+#: src/LYOptions.c:3863
 msgid "Preferred document language"
 msgstr "Bahasa dokumen yang disukai"
 
-#: src/LYOptions.c:3793
+#: src/LYOptions.c:3869
+msgid "Send User-Agent header"
+msgstr "Header User-Agent"
+
+#: src/LYOptions.c:3871
 msgid "User-Agent header"
 msgstr "Header User-Agent"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3801
+#: src/LYOptions.c:3879
 msgid "Listing and Accessing Files"
 msgstr "Mendaftar dan Mengakses Berkas"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3806
+#: src/LYOptions.c:3884
 msgid "Use Passive FTP"
 msgstr "Gunakan Passive FTP"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3812
+#: src/LYOptions.c:3890
 msgid "FTP sort criteria"
 msgstr "Kriteria pengurutan FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3820
+#: src/LYOptions.c:3898
 msgid "Local directory sort criteria"
 msgstr "Kriteria pengurutan direktori lokal"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3826
+#: src/LYOptions.c:3904
 msgid "Local directory sort order"
 msgstr "Pengurutan direktori lokal"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3913
 msgid "Show dot files"
 msgstr "Tampilkan berkas titik"
 
-#: src/LYOptions.c:3843
+#: src/LYOptions.c:3921
 msgid "Execution links"
 msgstr "Eksekusi sambungan"
 
+#: src/LYOptions.c:3939
+msgid "Pause when showing message"
+msgstr "Pause when showing message"
+
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:3946
 msgid "Show transfer rate"
 msgstr "Tampilkan kecepatan transfer"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3883
+#: src/LYOptions.c:3966
 msgid "Special Files and Screens"
 msgstr "Berkas Spesial dan Layar"
 
-#: src/LYOptions.c:3888
+#: src/LYOptions.c:3971
 msgid "Multi-bookmarks"
 msgstr "Multi-bookmarks"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3979
 msgid "Review/edit Bookmarks files"
 msgstr "Ulas/ubah berkas Bookmarks"
 
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:3982
 msgid "Goto multi-bookmark menu"
 msgstr "Goto menu multi-bookmark"
 
-#: src/LYOptions.c:3900
+#: src/LYOptions.c:3984
 msgid "Bookmarks file"
 msgstr "Berkas bookmarks"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3907
+#: src/LYOptions.c:3991
 msgid "Auto Session"
 msgstr "Sesi otomatis"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3913
+#: src/LYOptions.c:3997
 msgid "Session file"
 msgstr "Berkas sesi"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3919
+#: src/LYOptions.c:4003
 msgid "Visited Pages"
 msgstr "Halaman Dikunjungi"
 
-#: src/LYOptions.c:3924
+#: src/LYOptions.c:4008
 msgid "View the file "
 msgstr "Lihat berkas "
 
-#: src/LYPrint.c:937
+#: src/LYPrint.c:947
 #, c-format
 msgid " Print job complete.\n"
 msgstr " Pekerjaan pencetakan selesai.\n"
 
-#: src/LYPrint.c:1262
+#: src/LYPrint.c:1274
 msgid "Document:"
 msgstr "Dokumen:"
 
-#: src/LYPrint.c:1263
+#: src/LYPrint.c:1275
 msgid "Number of lines:"
 msgstr "Jumlah dari baris:"
 
-#: src/LYPrint.c:1264
+#: src/LYPrint.c:1276
 msgid "Number of pages:"
 msgstr "Jumlah dari halaman:"
 
-#: src/LYPrint.c:1265
+#: src/LYPrint.c:1277
 msgid "pages"
 msgstr "halaman"
 
-#: src/LYPrint.c:1265
+#: src/LYPrint.c:1277
 msgid "page"
 msgstr "halaman"
 
-#: src/LYPrint.c:1266
+#: src/LYPrint.c:1278
 msgid "(approximately)"
 msgstr "(kira kira)"
 
-#: src/LYPrint.c:1273
+#: src/LYPrint.c:1285
 msgid "Some print functions have been disabled!"
 msgstr "Beberapa fungsi pencetakan telah dinon-aktifkan!"
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1289
 msgid "Standard print options:"
 msgstr "Opsi pencetakan standar:"
 
-#: src/LYPrint.c:1278
+#: src/LYPrint.c:1290
 msgid "Print options:"
 msgstr "Opsi pencetakan:"
 
-#: src/LYPrint.c:1285
+#: src/LYPrint.c:1297
 msgid "Save to a local file"
 msgstr "Simpan ke sebuah bekas lokal"
 
-#: src/LYPrint.c:1287
+#: src/LYPrint.c:1299
 msgid "Save to disk disabled"
 msgstr "Simpan ke disk tidak aktif"
 
-#: src/LYPrint.c:1294
+#: src/LYPrint.c:1306
 msgid "Mail the file"
 msgstr "Berkas dikirimkan melalui surat"
 
-#: src/LYPrint.c:1301
+#: src/LYPrint.c:1313
 msgid "Print to the screen"
 msgstr "Tampilkan ke layar"
 
-#: src/LYPrint.c:1306
+#: src/LYPrint.c:1318
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Tampilkan ke sebuah pencetak dipasang ke terminal vt100 anda"
 
-#: src/LYReadCFG.c:371
+#: src/LYReadCFG.c:441
 #, c-format
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
@@ -5140,295 +5199,295 @@
 "Disini FOREGROUND dan BACKGROUND harus salah sati dari:\n"
 "String spesial 'nocolor' atau 'baku', atau\n"
 
-#: src/LYReadCFG.c:384
+#: src/LYReadCFG.c:454
 msgid "Offending line:"
 msgstr "Baris yang menyerang:"
 
-#: src/LYReadCFG.c:681
+#: src/LYReadCFG.c:757
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "Pemetaan tombol dari %s ke %s untuk %s gagal\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:764
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "pemetaan tombol dari %s ke %s gagal\n"
 
-#: src/LYReadCFG.c:709
+#: src/LYReadCFG.c:785
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "pemilihan pengubah baris %s untuk tombol %s tidak valid, memilih semua\n"
 
-#: src/LYReadCFG.c:734 src/LYReadCFG.c:746
+#: src/LYReadCFG.c:810 src/LYReadCFG.c:822
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "setting dari binding pengubah baris untuk tombol %s (0x%x) ke 0x%x untuk %s gagal\n"
 
-#: src/LYReadCFG.c:750
+#: src/LYReadCFG.c:826
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "setting dari pengubah baris binding untuk tombol %s (0x%x) untuk %s gagal\n"
 
-#: src/LYReadCFG.c:846
+#: src/LYReadCFG.c:922
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lunx: tidak dapat memulai, berkas aturan CERN %s tidak tersedia\n"
 
-#: src/LYReadCFG.c:847
+#: src/LYReadCFG.c:923
 msgid "(no name)"
 msgstr "(tidak ada nama)"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:2044
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Lebih dari %d nested lynx.cfg termasuk -- mungkin disana ada sebuah loop?!?\n"
 
-#: src/LYReadCFG.c:1884
+#: src/LYReadCFG.c:2046
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Percobaan terakhir termasuk '%s',\n"
 
-#: src/LYReadCFG.c:1885
+#: src/LYReadCFG.c:2047
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "dimasukan dari '%s'.\n"
 
-#: src/LYReadCFG.c:2289 src/LYReadCFG.c:2302 src/LYReadCFG.c:2360
+#: src/LYReadCFG.c:2450 src/LYReadCFG.c:2463 src/LYReadCFG.c:2521
 msgid "The following is read from your lynx.cfg file."
 msgstr "Berikut dibaca dari berkas lynx.cfg anda."
 
-#: src/LYReadCFG.c:2290 src/LYReadCFG.c:2303
+#: src/LYReadCFG.c:2451 src/LYReadCFG.c:2464
 msgid "Please read the distribution"
 msgstr "Mohon baca distribusi"
 
-#: src/LYReadCFG.c:2296 src/LYReadCFG.c:2306
+#: src/LYReadCFG.c:2457 src/LYReadCFG.c:2467
 msgid "for more comments."
 msgstr "Untuk komentar lebih."
 
-#: src/LYReadCFG.c:2342
+#: src/LYReadCFG.c:2503
 msgid "RELOAD THE CHANGES"
 msgstr "MUAT KEMBALI PERUBAHAN"
 
-#: src/LYReadCFG.c:2350
+#: src/LYReadCFG.c:2511
 msgid "Your primary configuration"
 msgstr "Konfigurasi Utama Anda"
 
-#: src/LYShowInfo.c:173
+#: src/LYShowInfo.c:177
 msgid "Directory that you are currently viewing"
 msgstr "Direktori yang saat ini sedang anda lihat"
 
-#: src/LYShowInfo.c:176
+#: src/LYShowInfo.c:180
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/LYShowInfo.c:179
+#: src/LYShowInfo.c:183
 msgid "URL:"
 msgstr "URL:"
 
-#: src/LYShowInfo.c:193
+#: src/LYShowInfo.c:197
 msgid "Directory that you have currently selected"
 msgstr "Direktori yang saat ini sedang anda pilih"
 
-#: src/LYShowInfo.c:195
+#: src/LYShowInfo.c:199
 msgid "File that you have currently selected"
 msgstr "Berkas yang saat ini sedang anda pilih"
 
-#: src/LYShowInfo.c:198
+#: src/LYShowInfo.c:202
 msgid "Symbolic link that you have currently selected"
 msgstr "Link simbolik yang saat ini sedang anda pilih"
 
-#: src/LYShowInfo.c:201
+#: src/LYShowInfo.c:205
 msgid "Item that you have currently selected"
 msgstr "Item yang saat ini sedang anda pilih"
 
-#: src/LYShowInfo.c:203
+#: src/LYShowInfo.c:207
 msgid "Full name:"
 msgstr "Nama lengkap:"
 
-#: src/LYShowInfo.c:213
+#: src/LYShowInfo.c:217
 msgid "Unable to follow link"
 msgstr "Tidak dapat mengikuti sambungan"
 
-#: src/LYShowInfo.c:215
+#: src/LYShowInfo.c:219
 msgid "Points to file:"
 msgstr "Menunjuk ke berkas:"
 
-#: src/LYShowInfo.c:220
+#: src/LYShowInfo.c:224
 msgid "Name of owner:"
 msgstr "Nama dari pemilik:"
 
-#: src/LYShowInfo.c:223
+#: src/LYShowInfo.c:227
 msgid "Group name:"
 msgstr "Nama grup:"
 
-#: src/LYShowInfo.c:225
+#: src/LYShowInfo.c:229
 msgid "File size:"
 msgstr "Ukuran berkas:"
 
-#: src/LYShowInfo.c:227
+#: src/LYShowInfo.c:231
 msgid "(bytes)"
 msgstr "(byte)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:232
+#: src/LYShowInfo.c:236
 msgid "Creation date:"
 msgstr "Tanggal pembuatan:"
 
-#: src/LYShowInfo.c:235
+#: src/LYShowInfo.c:239
 msgid "Last modified:"
 msgstr "Modifikasi terakhir:"
 
-#: src/LYShowInfo.c:238
+#: src/LYShowInfo.c:242
 msgid "Last accessed:"
 msgstr "Terakhir diakses:"
 
-#: src/LYShowInfo.c:244
+#: src/LYShowInfo.c:248
 msgid "Access Permissions"
 msgstr "Ijin Akses"
 
-#: src/LYShowInfo.c:279
+#: src/LYShowInfo.c:283
 msgid "Group:"
 msgstr "Grup:"
 
-#: src/LYShowInfo.c:299
+#: src/LYShowInfo.c:303
 msgid "World:"
 msgstr "Dunia:"
 
-#: src/LYShowInfo.c:306
+#: src/LYShowInfo.c:310
 msgid "File that you are currently viewing"
 msgstr "Berkas yang saat ini sedang anda lihat"
 
-#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
+#: src/LYShowInfo.c:318 src/LYShowInfo.c:422
 msgid "Linkname:"
 msgstr "Nama sambungan:"
 
-#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
+#: src/LYShowInfo.c:324 src/LYShowInfo.c:339
 msgid "Charset:"
 msgstr "Charset:"
 
-#: src/LYShowInfo.c:334
+#: src/LYShowInfo.c:338
 msgid "(assumed)"
 msgstr "(diasumsikan)"
 
-#: src/LYShowInfo.c:341
+#: src/LYShowInfo.c:345
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:344
+#: src/LYShowInfo.c:348
 msgid "Date:"
 msgstr "Tanggal:"
 
-#: src/LYShowInfo.c:347
+#: src/LYShowInfo.c:351
 msgid "Last Mod:"
 msgstr "Modifikasi Terakhir:"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:356
 msgid "Expires:"
 msgstr "Kadaluarsa:"
 
-#: src/LYShowInfo.c:355
+#: src/LYShowInfo.c:359
 msgid "Cache-Control:"
 msgstr "Cache-Control:"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:362
 msgid "Content-Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:366
 msgid "Length:"
 msgstr "Panjang:"
 
-#: src/LYShowInfo.c:367
+#: src/LYShowInfo.c:371
 msgid "Language:"
 msgstr "Bahasa:"
 
-#: src/LYShowInfo.c:374
+#: src/LYShowInfo.c:378
 msgid "Post Data:"
 msgstr "Post Data:"
 
-#: src/LYShowInfo.c:377
+#: src/LYShowInfo.c:381
 msgid "Post Content Type:"
 msgstr "Tipe Isi Post:"
 
-#: src/LYShowInfo.c:380
+#: src/LYShowInfo.c:384
 msgid "Owner(s):"
 msgstr "Pemilik:"
 
-#: src/LYShowInfo.c:385
+#: src/LYShowInfo.c:389
 msgid "size:"
 msgstr "ukuran:"
 
-#: src/LYShowInfo.c:387
+#: src/LYShowInfo.c:391
 msgid "lines"
 msgstr "baris"
 
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:395
 msgid "forms mode"
 msgstr "formulir mode"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:397
 msgid "source"
 msgstr "sumber"
 
-#: src/LYShowInfo.c:394
+#: src/LYShowInfo.c:398
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:396
+#: src/LYShowInfo.c:400
 msgid ", safe"
 msgstr ", aman"
 
-#: src/LYShowInfo.c:398
+#: src/LYShowInfo.c:402
 msgid ", via internal link"
 msgstr ", melalui link internal"
 
-#: src/LYShowInfo.c:403
+#: src/LYShowInfo.c:407
 msgid ", no-cache"
 msgstr ", tidak ada cache"
 
-#: src/LYShowInfo.c:405
+#: src/LYShowInfo.c:409
 msgid ", ISMAP script"
 msgstr ", ISMAP script"
 
-#: src/LYShowInfo.c:407
+#: src/LYShowInfo.c:411
 msgid ", bookmark file"
 msgstr ", berkas bookmark"
 
-#: src/LYShowInfo.c:411
+#: src/LYShowInfo.c:415
 msgid "mode:"
 msgstr "mode:"
 
-#: src/LYShowInfo.c:417
+#: src/LYShowInfo.c:421
 msgid "Link that you currently have selected"
 msgstr "Sambungan yang saat ini anda pilih"
 
-#: src/LYShowInfo.c:426
+#: src/LYShowInfo.c:430
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:434
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:436
+#: src/LYShowInfo.c:440
 msgid "Action:"
 msgstr "Aksi:"
 
-#: src/LYShowInfo.c:441
+#: src/LYShowInfo.c:446
 msgid "(Form field)"
 msgstr "(Form Field)"
 
-#: src/LYShowInfo.c:450
+#: src/LYShowInfo.c:457
 msgid "No Links on the current page"
 msgstr "Tidak ada sambungan di halaman sekarang"
 
-#: src/LYShowInfo.c:455
+#: src/LYShowInfo.c:463
 msgid "Server Headers:"
 msgstr "Header Server:"
 
-#: src/LYStyle.c:312
+#: src/LYStyle.c:331
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5449,61 +5508,61 @@
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "disini adalah daftar dari sejarah stack yang dapat anda buat kembali"
 
-#: src/LYUpload.c:75
+#: src/LYUpload.c:77
 msgid "ERROR! - upload command is misconfigured"
 msgstr "ERROR! - perintah upload salah konfigurasi"
 
-#: src/LYUpload.c:96
+#: src/LYUpload.c:98
 msgid "Illegal redirection \"../\" found! Request ignored."
 msgstr "redireksi \"../\" tidak legal ditemukan! Permintaan diabaikan."
 
-#: src/LYUpload.c:99
+#: src/LYUpload.c:101
 msgid "Illegal character \"/\" found! Request ignored."
 msgstr "Karakter tidak legal \"/\" ditemukan! Permintaan diabaikan."
 
-#: src/LYUpload.c:102
+#: src/LYUpload.c:104
 msgid "Illegal redirection using \"~\" found! Request ignored."
 msgstr "Redireksi menggunakan \"~\" tidak legal ditemukan! Permintaan diabaikan."
 
-#: src/LYUpload.c:159
+#: src/LYUpload.c:157
 msgid "Unable to upload file."
 msgstr "Tidak dapat mengupload berkas."
 
-#: src/LYUpload.c:201
+#: src/LYUpload.c:199
 msgid "Upload To:"
 msgstr "Upload Ke:"
 
-#: src/LYUpload.c:202
+#: src/LYUpload.c:200
 msgid "Upload options:"
 msgstr "Opsi Upload:"
 
-#: src/LYUtils.c:1830
+#: src/LYUtils.c:1883
 msgid "Download document URL put to clipboard."
 msgstr "URL unduh dokumen diletakan ke clipboard."
 
-#: src/LYUtils.c:2614
+#: src/LYUtils.c:2668
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Protokol akses tidak terduga untuk skema URL ini."
 
-#: src/LYUtils.c:3422
+#: src/LYUtils.c:3492
 msgid "Too many tempfiles"
 msgstr "Terlalu banyak berkas tempfiles"
 
-#: src/LYUtils.c:3722
+#: src/LYUtils.c:3792
 msgid "unknown restriction"
 msgstr "restriksi tidak diketahui"
 
-#: src/LYUtils.c:3753
+#: src/LYUtils.c:3823
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Tidak ada set restriksi.\n"
 
-#: src/LYUtils.c:3756
+#: src/LYUtils.c:3826
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Set restriksi:\n"
 
-#: src/LYUtils.c:5134
+#: src/LYUtils.c:5212
 msgid "Cannot find HOME directory"
 msgstr "Tidak dapat menemukan direktori HOME"
 
@@ -5511,7 +5570,7 @@
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Secara normal tidak aktif. Lihat ENABLE_LYNXRC dalam lynx.cfg\n"
 
-#: src/LYrcFile.c:317
+#: src/LYrcFile.c:325
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5523,7 +5582,7 @@
 "menanyakan untuk setiap cookie. Set accept_all_cookies ke \"TRUE\" untuk\n"
 "menerima semua cookie.\n"
 
-#: src/LYrcFile.c:325
+#: src/LYrcFile.c:333
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
@@ -5535,7 +5594,7 @@
 "yang diberikan Lynx akan menggunakan alamat email pribadi. Set anonftp_password\n"
 "ke sebuah nilai berbeda jika anda memilih.\n"
 
-#: src/LYrcFile.c:332
+#: src/LYrcFile.c:342
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
@@ -5545,7 +5604,7 @@
 "kedalam dimana pengguna dapat paste link untuk akses mudah di waktu\n"
 "kemudian.\n"
 
-#: src/LYrcFile.c:337
+#: src/LYrcFile.c:347
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5555,7 +5614,7 @@
 "pencarian menggunakan tombol 's' atau '/', pencarian yang dilakukan akan\n"
 "memperhatikan besar huruf dari pada tidak diperhatikan. Baku biasanya \"off\".\n"
 
-#: src/LYrcFile.c:342
+#: src/LYrcFile.c:352
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5569,7 +5628,7 @@
 "approksimasi karakter 7 bit.\n"
 "Set karakter yang valid sekarang adalah:\n"
 
-#: src/LYrcFile.c:349
+#: src/LYrcFile.c:359
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5583,7 +5642,7 @@
 "opsi, penolakan akan mengambil prioritas. Parameter accept_all_cookies akan\n"
 "override konfigurasi apapun yang dibuat disini.\n"
 
-#: src/LYrcFile.c:357
+#: src/LYrcFile.c:367
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
@@ -5591,7 +5650,7 @@
 "cookie_file menspesifikasikan berkas yang dibaca persistent cookies.\n"
 "Baku adalah ~/"
 
-#: src/LYrcFile.c:362
+#: src/LYrcFile.c:372
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5609,7 +5668,7 @@
 "diijinkan untuk menset cookies dengan sebuah jalur tidak valid atau atribut\n"
 "domain. Semua domain akan baku ke permintaan pengguna untuk sebuah jalur atau domain tidak valid.\n"
 
-#: src/LYrcFile.c:376
+#: src/LYrcFile.c:386
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
@@ -5617,7 +5676,7 @@
 "dir_list_order menspesifikasikan urutan daftar direktori dibawah DIRED_SUPPORT\n"
 "(jika diimplementasikan). Baku adalah \"ORDER_BY_NAME\"\n"
 
-#: src/LYrcFile.c:381
+#: src/LYrcFile.c:391
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5629,7 +5688,7 @@
 "berkas dan direktori bersama. \"FILES_FIRST\" daftar berkas pertama dan\n"
 "\"DIRECTORIES_FIRST\" daftar direktori pertama.\n"
 
-#: src/LYrcFile.c:389
+#: src/LYrcFile.c:399
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5641,7 +5700,7 @@
 "  ^B = kiri    ^F = kanan\n"
 "akan diaktifkan.\n"
 
-#: src/LYrcFile.c:395
+#: src/LYrcFile.c:405
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5653,7 +5712,7 @@
 "maka pengubahan berkas tidak aktif kecuali ini diaktifkan dari baris perintah,\n"
 "dan built-in baris pengubah akan digunakan untuk mengirim surat.\n"
 
-#: src/LYrcFile.c:402
+#: src/LYrcFile.c:412
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5669,7 +5728,7 @@
 "   BY_SIZE     -- urutkan berdasarkan ukuran dari berkas\n"
 "   BY_DATE     -- urutkan berdasarkan tanggal dari berkas\n"
 
-#: src/LYrcFile.c:424
+#: src/LYrcFile.c:435
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5695,7 +5754,7 @@
 "\n"
 "Mode lineedit sekarang:\n"
 
-#: src/LYrcFile.c:442
+#: src/LYrcFile.c:453
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5707,7 +5766,7 @@
 "Sampai ke 26 berkas bookmark (untuk huruf besar bahasa inggris) diijinkan.\n"
 "Kita memulai dengan \"multi_bookmarkB\" karena 'A' adalah baku (lihat diatas).\n"
 
-#: src/LYrcFile.c:448
+#: src/LYrcFile.c:459
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5725,7 +5784,27 @@
 "juga dapat meninggalkan daerah ini kosong, tetapi nanti anda tidak akan\n"
 "memasukannya ke komentar surat anda.\n"
 
-#: src/LYrcFile.c:457
+#: src/LYrcFile.c:468
+msgid ""
+"personal_mail_name specifies your personal name, for mail.  The\n"
+"name is sent for mailed comments.  Lynx will prompt for this,\n"
+"showing the configured value as a default when sending mail.\n"
+"This is not necessarily the same as a name provided as part of the\n"
+"personal_mail_address.\n"
+"Lynx does not save your changes to that default value as a side-effect\n"
+"of sending email.  To update the default value, you must use the options\n"
+"menu, or modify this file directly.\n"
+msgstr ""
+"personal_mail_name specifies your personal name, for mail.  The\n"
+"name is sent for mailed comments.  Lynx will prompt for this,\n"
+"showing the configured value as a default when sending mail.\n"
+"This is not necessarily the same as a name provided as part of the\n"
+"personal_mail_address.\n"
+"Lynx does not save your changes to that default value as a side-effect\n"
+"of sending email.  To update the default value, you must use the options\n"
+"menu, or modify this file directly.\n"
+
+#: src/LYrcFile.c:478
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5753,7 +5832,7 @@
 "pesan balasan error, walaupun pengiriman dari sebuah balasan tidak diterima\n"
 "juga diijinkan.\n"
 
-#: src/LYrcFile.c:473
+#: src/LYrcFile.c:494
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5767,7 +5846,7 @@
 "Jika sebuah berkas dalam bahasa itu tersedia, server akan mengirimkannya.\n"
 "Jika tidak, server akan mengirim berkas dalam bahasa bakunya.\n"
 
-#: src/LYrcFile.c:484
+#: src/LYrcFile.c:505
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5789,7 +5868,7 @@
 "             atau kompromi keamanan. Ini seharusnya hanya diset ke \"on\" jika\n"
 "             anda melihat sumber informasi yang dipercaya.\n"
 
-#: src/LYrcFile.c:495
+#: src/LYrcFile.c:516
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5816,7 +5895,7 @@
 "             Ini seharusnya diset ke \"on\" jika anda melihat ke sumber\n"
 "             informasi yang dapat dipercaya.\n"
 
-#: src/LYrcFile.c:513
+#: src/LYrcFile.c:534
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5834,7 +5913,7 @@
 "sebagai baku ketika sebuah nilai dari \"off\" akan menset penggunaan dari boxes.\n"
 "Baku dapat dioverridden melalui opsi baris perintah -popup .\n"
 
-#: src/LYrcFile.c:523
+#: src/LYrcFile.c:545
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5868,7 +5947,7 @@
 "'o'ptions. Jika konfigurasi option disimpan, \"on\" dan \"off\" \"show color\"\n"
 "konfigurasi akan diperlakukan sebagai \"default\".\n"
 
-#: src/LYrcFile.c:540
+#: src/LYrcFile.c:562
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5890,7 +5969,7 @@
 "'hiding' dari kursor.\n"
 "baku dapat dioverriden melalui opsi baris perintah -show_cursor.\n"
 
-#: src/LYrcFile.c:551
+#: src/LYrcFile.c:573
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5904,7 +5983,7 @@
 "sebuah opsi baris perintah. Jika penampilan dari berkas tersembunyi tidak \n"
 "aktif, pembuatan dari berkas seperti itu melalui Lynx juga tidak aktif.\n"
 
-#: src/LYrcFile.c:562
+#: src/LYrcFile.c:584
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5925,7 +6004,7 @@
 "statusline daripada menu terlihat dalam mode pengguna pemula dan menengah.\n"
 "Ketika opsi ini diset ke \"standard\", menu akan ditampilkan tidak perduli mode pengguna.\n"
 
-#: src/LYrcFile.c:576
+#: src/LYrcFile.c:598
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -5941,7 +6020,7 @@
 "Gunakan \"ADVANCED\" untuk melihat URL dari link yang saat ini dipilih di\n"
 "bawah dari layar.\n"
 
-#: src/LYrcFile.c:585
+#: src/LYrcFile.c:607
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -5951,7 +6030,7 @@
 "berkas sumber ditempat dari [INLINE], [LINK] atau [GAMBAR]\n"
 "Lihat juga VERBOSE_IMAGES dalam lynx.cfg\n"
 
-#: src/LYrcFile.c:590
+#: src/LYrcFile.c:612
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5967,7 +6046,7 @@
 "Huruf kapital 'H', 'J' dan 'K' akan tetapi mengaktifkan bantuan, lompat shortcuts,\n"
 "dan menampilkan peta tombol.\n"
 
-#: src/LYrcFile.c:598
+#: src/LYrcFile.c:620
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -5975,7 +6054,7 @@
 "visited_links konfigurasi mengontrol bagaimana Lynx mengorganisasi informasi\n"
 "dalam halaman Visited Links.\n"
 
-#: src/LYrcFile.c:819
+#: src/LYrcFile.c:845
 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"
@@ -5993,7 +6072,7 @@
 "dan nomor keyboard yang berhubungan akan berlaku sebagai tombol panah,\n"
 "tidak perduli apakah numlock aktif.\n"
 
-#: src/LYrcFile.c:828
+#: src/LYrcFile.c:854
 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"
@@ -6001,7 +6080,7 @@
 "Jika keypad_mode diset ke \"LINKS_ARE_NUMBERED\", maka nomor akan muncul\n"
 "setelah setiap link dan nomor yang digunakan untuk memilih link.\n"
 
-#: src/LYrcFile.c:832
+#: src/LYrcFile.c:858
 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"
@@ -6019,7 +6098,7 @@
 "sebuah opsi dalam sebuah menu popup, bahkan jika opsi tidak terlihat dilayar.\n"
 "Daftar referensi dan keluaran dari baris perintah juga mengenumerasi masukan formulir.\n"
 
-#: src/LYrcFile.c:841
+#: src/LYrcFile.c:867
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6029,7 +6108,7 @@
 "\"LINKS_ARE_NUMBERED\" atau \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\"\n"
 "diaktifkan.\n"
 
-#: src/LYrcFile.c:873
+#: src/LYrcFile.c:899
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -6037,7 +6116,7 @@
 "Berkas Baku Pengguna Lynx\n"
 "\n"
 
-#: src/LYrcFile.c:882
+#: src/LYrcFile.c:908
 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"
@@ -6047,7 +6126,7 @@
 "dengan tombol 'o'). Untuk menyimpan opsi di layar itu, anda harus\n"
 "memilih checkbox:\n"
 
-#: src/LYrcFile.c:889
+#: src/LYrcFile.c:915
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
@@ -6055,7 +6134,7 @@
 "Anda harus menyimpan konfigurasi menggunakan sambungan di baris\n"
 "diatas checkbox:\n"
 
-#: src/LYrcFile.c:896
+#: src/LYrcFile.c:922
 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"
@@ -6065,7 +6144,7 @@
 "menampilkan Opsi Menu lebih sederhana. Simpan opsi dengan itu menggunakan\n"
 "tombol '>'.\n"
 
-#: src/LYrcFile.c:903
+#: src/LYrcFile.c:929
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
@@ -6075,7 +6154,7 @@
 "dengan tombol '>').\n"
 "\n"
 
-#: src/LYrcFile.c:910
+#: src/LYrcFile.c:936
 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"
@@ -6094,6 +6173,15 @@
 "Jika anda mencari untuk berkas konfigurasi umum - ini secara normal dipanggil\n"
 "lynx.cfg, dan ini memiliki isi berbeda dan sebuah format berbeda.\n"
 "Tapi bukan berkas ini.\n"
+
+#~ msgid "Very long lines have been wrapped!"
+#~ msgstr "Baris sangat panjang telah dipotong!"
+
+#~ msgid "Path too long"
+#~ msgstr "Jalur terlalu panjang"
+
+#~ msgid "Source and destination are the same location - request ignored!"
+#~ msgstr "Sumber dan tujuan berada dilokasi yang sama - permintaan diabaikan!"
 
 #~ msgid "Socket read failed for 180,000 tries."
 #~ msgstr "Pembacaan socket gagal untuk pencobaan 180,000 kali."
Index: po/makefile.inn
--- 2.8.9dev.1/po/makefile.inn	Mon Oct  4 09:44:56 2010
+++ 2.8.9dev.2/po/makefile.inn	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-# $LynxId: makefile.inn,v 1.19 2010/09/19 18:34:55 tom Exp $
+# $LynxId: makefile.inn,v 1.21 2014/12/22 00:09:52 tom Exp $
 #
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
@@ -97,6 +97,15 @@
 
 en.po :	
 	msginit --no-translator -l en -i $(PACKAGE).pot
+	# cygwin's msginit 1.19.3 creates "en_US.po" rather than "en.po"...
+	@$(SHELL) -c 'for n in en*.po; \
+		do \
+		if test -f $$n; \
+		then \
+			test $$n != $@ && mv -vf $$n $@; \
+			break; \
+		fi \
+		done'
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
 	$(XGETTEXT) --default-domain=$(NLS_TEXTDOMAIN) --directory=$(top_srcdir) \
Index: src/GridText.c
--- 2.8.9dev.1/src/GridText.c	Fri Feb 14 13:00:16 2014
+++ 2.8.9dev.2/src/GridText.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.277 2014/02/13 19:32:01 tom Exp $
+ * $LynxId: GridText.c,v 1.286 2014/12/16 01:23:52 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -3257,7 +3257,7 @@
     }				/* switch */
     previous->offset = (unsigned short) ((new_offset < 0) ? 0 : new_offset);
 
-    if (text->stbl)
+    if (text->stbl) {
 	/*
 	 * Notify simple table stuff of line split, so that it can
 	 * set the last cell's length.  The last cell should and
@@ -3273,6 +3273,7 @@
 		       text->Lines - 1,
 		       previous->offset,
 		       previous->size - ctrl_chars_on_previous_line);
+    }
 
     text->in_line_1 = NO;	/* unless caller sets it otherwise */
 
@@ -4876,8 +4877,9 @@
 	} else
 #endif
 	{
-	    if (me->stbl)
+	    if (me->stbl) {
 		HText_cancelStbl(me);	/* auto cancel previously open table */
+	    }
 	}
 
 	me->stbl = Stbl_startTABLE(alignment);
@@ -4978,8 +4980,9 @@
 {
     if (!me || !me->stbl)
 	return;
-    if (Stbl_addRowToTable(me->stbl, alignment, me->Lines) < 0)
+    if (Stbl_addRowToTable(me->stbl, alignment, me->Lines) < 0) {
 	HText_cancelStbl(me);	/* give up */
+    }
 }
 
 /*	Finish simple table row
@@ -5013,8 +5016,9 @@
     if (Stbl_addCellToTable(me->stbl, colspan, rowspan, alignment, isheader,
 			    me->Lines,
 			    HText_LastLineOffset(me),
-			    HText_LastLineSize(me, FALSE)) < 0)
+			    HText_LastLineSize(me, FALSE)) < 0) {
 	HText_cancelStbl(me);	/* give up */
+    }
 }
 
 /*	Finish simple table cell
@@ -5026,8 +5030,9 @@
     if (Stbl_finishCellInTable(me->stbl, TRST_ENDCELL_ENDTD,
 			       me->Lines,
 			       HText_LastLineOffset(me),
-			       HText_LastLineSize(me, FALSE)) < 0)
+			       HText_LastLineSize(me, FALSE)) < 0) {
 	HText_cancelStbl(me);	/* give up */
+    }
 }
 
 /*	Remember COL info / Start a COLGROUP and remember info
@@ -5044,8 +5049,9 @@
 	CTRACE((tfp, "*** SPAN=%d is too large, ignored!\n", span));
 	span = 1;
     }
-    if (Stbl_addColInfo(me->stbl, span, alignment, isgroup) < 0)
+    if (Stbl_addColInfo(me->stbl, span, alignment, isgroup) < 0) {
 	HText_cancelStbl(me);	/* give up */
+    }
 }
 
 /*	Finish a COLGROUP
@@ -5054,8 +5060,9 @@
 {
     if (!me || !me->stbl)
 	return;
-    if (Stbl_finishColGroup(me->stbl) < 0)
+    if (Stbl_finishColGroup(me->stbl) < 0) {
 	HText_cancelStbl(me);	/* give up */
+    }
 }
 
 /*	Start a THEAD / TFOOT / TBODY - remember its alignment info
@@ -5064,8 +5071,9 @@
 {
     if (!me || !me->stbl)
 	return;
-    if (Stbl_addRowGroup(me->stbl, alignment) < 0)
+    if (Stbl_addRowGroup(me->stbl, alignment) < 0) {
 	HText_cancelStbl(me);	/* give up */
+    }
 }
 
 static void compute_show_number(TextAnchor *a)
@@ -5739,8 +5747,9 @@
     new_line(text);
 
     if (text->halted) {
-	if (text->stbl)
+	if (text->stbl) {
 	    HText_cancelStbl(text);
+	}
 	/*
 	 * If output was stopped because memory was low, and we made
 	 * it to the end of the document, reset those flags and hope
@@ -7916,7 +7925,7 @@
     int size;			/* character-width of field */
     int length;			/* byte-count for field's data */
     int offset;			/* byte-offset in line's data */
-    int filler;			/* character to use for filler */
+    char filler;		/* character to use for filler */
     const char *value;		/* field's value */
 } AnchorIndex;
 
@@ -8065,19 +8074,34 @@
 }
 
 /*
+ * Return the column (counting from zero) at which a field should be overlaid
+ * on the form.
+ */
+static int FieldFirst(AnchorIndex * p, int wrap)
+{
+    return (wrap ? 0 : (p)->offset);
+}
+
+/*
+ * Return the column (counting from zero) just past the field in a form.
+ */
+static int FieldLast(AnchorIndex * p, int wrap)
+{
+    return ((p)->size - wrap) + FieldFirst(p, wrap);
+}
+
+/*
  * Print the contents of the file in HTMainText to
  * the file descriptor fp.
  * If is_email is TRUE add ">" before each "From " line.
  * If is_reply is TRUE add ">" to the beginning of each
  * line to specify the file is a reply to message.
  */
-#define FieldFirst(p) (this_wrap ? 0 : (p)->offset)
-#define FieldLast(p)  (FieldFirst(p) + (p)->size - this_wrap)
 void print_wwwfile_to_fd(FILE *fp,
 			 int is_email,
 			 int is_reply)
 {
-    int line_num, byte_num, byte_count;
+    int line_num, byte_num, byte_count, byte_next, byte_offset;
     int first = TRUE;
     HTLine *line;
     AnchorIndex **inx;		/* sorted index of input-fields */
@@ -8145,16 +8169,23 @@
 	/*
 	 * Add data.
 	 */
+	byte_offset = line->offset;
 	byte_count = TrimmedLength(line->data);
-	for (byte_num = 0; byte_num < byte_count; byte_num++) {
-	    int byte_offset = byte_num + line->offset;
-	    int ch = UCH(line->data[byte_num]);
-	    int c2;
+	byte_next = 1;
+	for (byte_num = 0; byte_num < byte_count; byte_num += byte_next) {
+	    int cell_chr, temp_chr;
+	    size_t cell_len, temp_len;
+	    const char *cell_ptr, *temp_ptr, *try_utf8;
+
+	    cell_ptr = &line->data[byte_num];
+	    cell_len = 1;
+	    cell_chr = UCH(*cell_ptr);
+	    byte_next = 1;
 
-	    while (cur != 0 && FieldLast(cur) < byte_offset) {
+	    while (cur != 0 && FieldLast(cur, this_wrap) < byte_offset) {
 		CTRACE2(TRACE_GRIDTEXT,
 			(tfp, "skip field since last %d < %d\n",
-			 FieldLast(cur), byte_offset));
+			 FieldLast(cur, this_wrap), byte_offset));
 		cur = cur->next;
 		in_field = -1;
 	    }
@@ -8162,15 +8193,15 @@
 		CTRACE2(TRACE_GRIDTEXT,
 			(tfp, "compare %d to [%d..%d]\n",
 			 byte_offset,
-			 FieldFirst(cur),
-			 FieldLast(cur) - 1));
+			 FieldFirst(cur, this_wrap),
+			 FieldLast(cur, this_wrap) - 1));
 	    }
 	    if (cur != 0
-		&& FieldFirst(cur) <= byte_offset
-		&& FieldLast(cur) > byte_offset) {
+		&& FieldFirst(cur, this_wrap) <= byte_offset
+		&& FieldLast(cur, this_wrap) > byte_offset) {
 		int off2 = ((in_field > 0)
 			    ? in_field
-			    : (byte_offset - FieldFirst(cur)));
+			    : (byte_offset - FieldFirst(cur, this_wrap)));
 
 		/*
 		 * On the first time (for each line that the field appears on),
@@ -8178,7 +8209,7 @@
 		 * the field which will be used to adjust the beginning of the
 		 * continuation line.
 		 */
-		if (byte_offset == FieldFirst(cur)) {
+		if (byte_offset == FieldFirst(cur, this_wrap)) {
 		    next_wrap = 0;
 		    if (cur->size - this_wrap + byte_num > byte_count) {
 			CTRACE((tfp, "size %d, offset %d, length %d\n",
@@ -8193,20 +8224,37 @@
 		    }
 		}
 
-		c2 = ((off2 < cur->length)
-		      ? cur->value[off2]
-		      : cur->filler);
+		if (off2 >= 0 && off2 < cur->length) {
+		    temp_ptr = &(cur->value[off2]);
+		    temp_len = 1;
+		    try_utf8 = temp_ptr;
+		    temp_chr = (int) UCGetUniFromUtf8String(&try_utf8);
+		    if (temp_chr > 127) {
+			temp_len = (size_t) (try_utf8 - temp_ptr) + 1;
+		    } else {
+			temp_chr = UCH(*temp_ptr);
+			temp_len = 1;
+		    }
+		} else {
+		    temp_ptr = &(cur->filler);
+		    temp_len = 1;
+		    temp_chr = UCH(*temp_ptr);
+		}
 
-		if (ch != c2) {
+		if (cell_chr != temp_chr) {
 		    CTRACE2(TRACE_GRIDTEXT,
-			    (tfp, "line %d %d/%d [%d..%d] map %d %c->%c\n",
+			    (tfp, "line %d %d/%d [%d..%d] map %d %04X->%04X\n",
 			     line_num,
 			     off2, cur->length,
-			     FieldFirst(cur), FieldLast(cur) - 1,
-			     byte_offset, ch, c2));
-		    ch = c2;
+			     FieldFirst(cur, this_wrap),
+			     FieldLast(cur, this_wrap) - 1,
+			     byte_offset, cell_chr, temp_chr));
+		    cell_chr = temp_chr;
+		    cell_ptr = temp_ptr;
+		    cell_len = temp_len;
 		}
-		++off2;
+		off2 += (int) temp_len;
+		byte_offset += (int) temp_len;
 		if ((off2 >= cur->size) &&
 		    (off2 >= cur->length || F_TEXTLIKE(cur->type))) {
 		    in_field = -1;
@@ -8215,26 +8263,37 @@
 		} else {
 		    in_field = off2;
 		}
+	    } else {
+		byte_offset++;
 	    }
 
-	    if (!IsSpecialAttrChar(ch)) {
+	    if (!IsSpecialAttrChar(cell_chr)) {
 #ifndef NO_DUMP_WITH_BACKSPACES
+		size_t n;
+
 		if (in_b) {
-		    fputc(ch, fp);
-		    fputc('\b', fp);
-		    fputc(ch, fp);
+		    IGNORE_RC(fwrite(cell_ptr, sizeof(char), cell_len, fp));
+
+		    for (n = 0; n < cell_len; ++n) {
+			fputc('\b', fp);
+		    }
+		    IGNORE_RC(fwrite(cell_ptr, sizeof(char), cell_len, fp));
 		} else if (in_u) {
-		    fputc('_', fp);
-		    fputc('\b', fp);
-		    fputc(ch, fp);
+		    for (n = 0; n < cell_len; ++n) {
+			fputc('_', fp);
+		    }
+		    for (n = 0; n < cell_len; ++n) {
+			fputc('\b', fp);
+		    }
+		    IGNORE_RC(fwrite(cell_ptr, sizeof(char), cell_len, fp));
 		} else
 #endif
-		    fputc(ch, fp);
-	    } else if (ch == LY_SOFT_HYPHEN &&
+		    IGNORE_RC(fwrite(cell_ptr, sizeof(char), cell_len, fp));
+	    } else if (cell_chr == LY_SOFT_HYPHEN &&
 		       (byte_num + 1) >= byte_count) {
 		write_hyphen(fp);
 	    } else if (dump_output_immediately && use_underscore) {
-		switch (ch) {
+		switch (cell_chr) {
 		case LY_UNDERLINE_START_CHAR:
 		case LY_UNDERLINE_END_CHAR:
 		    fputc('_', fp);
@@ -8246,7 +8305,7 @@
 	    }
 #ifndef NO_DUMP_WITH_BACKSPACES
 	    else if (bs) {
-		switch (ch) {
+		switch (cell_chr) {
 		case LY_UNDERLINE_START_CHAR:
 		    if (!in_b)
 			in_u = TRUE;	/*favor bold over underline */
@@ -11773,9 +11832,6 @@
 	if (Boundary) {
 	    HTBprintf(&my_query, "\r\n--%s--\r\n", Boundary);
 	}
-	/*
-	 * The data may contain a null - so we use fwrite().
-	 */
 	if (TRACE) {
 	    CTRACE((tfp, "Query %d{", BStrLen(my_query)));
 	    trace_bstring(my_query);
@@ -14724,7 +14780,7 @@
 		   x, STR_LYNXCACHE, x, title, address, address);
 	PUTS(buf);
 	if (Size > 0) {
-	    HTSprintf0(&buf, "Size: %" PRI_off_t "  ", Size);
+	    HTSprintf0(&buf, "Size: %" PRI_off_t "  ", CAST_off_t (Size));
 
 	    PUTS(buf);
 	}
Index: src/HTML.c
--- 2.8.9dev.1/src/HTML.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/HTML.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTML.c,v 1.164 2013/11/28 11:17:39 tom Exp $
+ * $LynxId: HTML.c,v 1.165 2014/12/16 01:21:32 tom Exp $
  *
  *		Structured stream to Rich hypertext converter
  *		============================================
@@ -5301,7 +5301,9 @@
 #ifdef EXP_NESTED_TABLES
 	if (!nested_tables)
 #endif
+	{
 	    HText_cancelStbl(me->text);
+	}
 
 	if (me->inA) {
 	    SET_SKIP_STACK(HTML_A);
@@ -5393,7 +5395,6 @@
 	if (me->sp->style->id == ST_Preformatted) {
 	    CHECK_ID(HTML_TR_ID);
 	    me->inP = FALSE;
-/*	    HText_cancelStbl(me->text);  seems unnecessary here - kw */
 	    break;
 	}
 	if (LYoverride_default_alignment(me)) {
Index: src/LYCgi.c
--- 2.8.9dev.1/src/LYCgi.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYCgi.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCgi.c,v 1.67 2013/11/28 11:35:56 tom Exp $
+ * $LynxId: LYCgi.c,v 1.68 2014/07/24 22:02:26 tom Exp $
  *                   Lynx CGI support                              LYCgi.c
  *                   ================
  *
@@ -145,6 +145,10 @@
 		     HTFormat format_out,
 		     HTStream *sink)
 {
+    (void) arg;
+    (void) anAnchor;
+    (void) format_out;
+    (void) sink;
     return -1;
 }
 #else
@@ -510,7 +514,7 @@
 		    status = HT_LOADED;
 		}
 
-#if !HAVE_WAITPID
+#ifndef HAVE_WAITPID
 		while (wait(&wstatus) != pid) ;		/* do nothing */
 #else
 		while (-1 == waitpid(pid, &wstatus, 0)) {	/* wait for child */
Index: src/LYCharSets.c
--- 2.8.9dev.1/src/LYCharSets.c	Mon Jul 29 21:38:35 2013
+++ 2.8.9dev.2/src/LYCharSets.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCharSets.c,v 1.68 2013/01/04 21:47:16 tom Exp $
+ * $LynxId: LYCharSets.c,v 1.69 2014/12/07 14:42:48 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTCJK.h>
@@ -1091,7 +1091,7 @@
 	    /*
 	     * Undefined (by convention, use the replacement character).
 	     */
-	    code = 0xfffd;
+	    code = UCS_REPL;
 	    break;
 	}
     }
Index: src/LYCharUtils.c
--- 2.8.9dev.1/src/LYCharUtils.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYCharUtils.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCharUtils.c,v 1.127 2013/11/28 11:17:59 tom Exp $
+ * $LynxId: LYCharUtils.c,v 1.128 2014/12/10 10:30:58 tom Exp $
  *
  *  Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM
  *  ==========================================================================
@@ -1081,7 +1081,7 @@
     BOOLEAN no_bytetrans;
     UCTransParams T;
     BOOL from_is_utf8 = FALSE;
-    char *puni;
+    char *puni = 0;
     enum _state {
 	S_text,
 	S_esc,
@@ -1416,12 +1416,15 @@
 
 	    if (from_is_utf8) {
 		if (((*p) & 0xc0) == 0xc0) {
+		    const char *pq = p;
+
 		    puni = p;
-		    code = UCGetUniFromUtf8String(&puni);
+		    code = UCGetUniFromUtf8String(&pq);
 		    if (code <= 0) {
 			code = UCH(*p);
 		    } else {
 			what = P_utf8;
+			puni += (pq - (const char *) p);
 		    }
 		}
 	    } else if (use_lynx_specials && !Back &&
Index: src/LYCookie.c
--- 2.8.9dev.1/src/LYCookie.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYCookie.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCookie.c,v 1.128 2013/11/28 11:18:12 tom Exp $
+ * $LynxId: LYCookie.c,v 1.129 2014/11/29 15:28:10 Mike.Gorse Exp $
  *
  *			       Lynx Cookie Support		   LYCookie.c
  *			       ===================
@@ -716,13 +716,14 @@
 				 char *header,
 				 int secure)
 {
-    HTList *hl;
+    HTList *hl, *next;
     cookie *co;
     time_t now = time(NULL);
     char crlftab[8];
 
     sprintf(crlftab, "%c%c%c", CR, LF, '\t');
-    for (hl = sublist; hl != NULL; hl = hl->next) {
+    for (hl = sublist; hl != NULL; hl = next) {
+	next = hl->next;
 	co = (cookie *) hl->object;
 
 	if (co == NULL) {
Index: src/LYCurses.c
--- 2.8.9dev.1/src/LYCurses.c	Sun Mar  9 21:43:10 2014
+++ 2.8.9dev.2/src/LYCurses.c	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.179 2014/02/20 23:14:31 Thomas.Klausner Exp $ */
+/* $LynxId: LYCurses.c,v 1.180 2014/07/24 22:08:24 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -980,6 +980,7 @@
 {
     char this_title[256];
 
+    (void) lParam;
     if (GetWindowText(hwnd, this_title, sizeof(this_title) - 1) &&
 	(strncmp(dummyWindowTitle, this_title, 256) == 0)) {
 	currentWindowHandle = hwnd;
@@ -1180,7 +1181,7 @@
     keypad(LYwin, TRUE);
     lynx_enable_mouse(1);
 
-#if defined(USE_KEYMAPS)  
+#if defined(USE_KEYMAPS)
     if (-1 == lynx_initialize_keymaps()) {
 	endwin();
 	exit_immediately(EXIT_FAILURE);
@@ -1402,7 +1403,7 @@
 #endif
 
 #if defined(USE_KEYMAPS) && defined(NCURSES_VERSION)
-#  if HAVE_KEYPAD
+#  ifdef HAVE_KEYPAD
 	/* Need to switch keypad on before initializing keymaps, otherwise
 	   when the keypad is switched on, some keybindings may be overriden. */
 	keypad(LYwin, TRUE);
Index: src/LYIcon.rc
--- 2.8.9dev.1/src/LYIcon.rc	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/src/LYIcon.rc	Mon Dec 22 01:39:40 2014
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.12 2014/03/10 21:44:33 tom Exp $
+// $LynxId: LYIcon.rc,v 1.13 2014/03/16 15:03:40 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1001
-PRODUCTVERSION 2,8,9,1001
+FILEVERSION    2,8,9,1002
+PRODUCTVERSION 2,8,9,1002
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@
     BEGIN
       VALUE "CompanyName",      "http://lynx.isc.org"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1001"
+      VALUE "FileVersion",      "2.8.9.1002"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2014 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1001"
+      VALUE "ProductVersion",   "2.8.9.1002"
     END
   END
   BLOCK "VarFileInfo"
Index: src/LYKeymap.c
--- 2.8.9dev.1/src/LYKeymap.c	Wed Dec 18 01:56:13 2013
+++ 2.8.9dev.2/src/LYKeymap.c	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.110 2013/12/17 00:27:55 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.113 2014/12/09 01:48:50 tom Exp $ */
 #include <HTUtils.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
@@ -967,7 +967,7 @@
 	    c = (-1);
 #ifdef USE_KEYMAPS
     } else {
-	map_string_to_keysym(src, &c);
+	map_string_to_keysym(src, &c, TRUE);
 #ifndef USE_SLANG
 	if (c >= 0) {
 	    /* make curses-keys mapped from Keysym_Strings[] available here */
@@ -1059,39 +1059,37 @@
 {
     Kcmd *mp;
     int c;
+    int result = 0;
 
 #if !defined(DIRED_SUPPORT) || !defined(OK_OVERRIDE)
-    if (for_dired)
-	return 0;
+    if (for_dired) {
+	return result;
+    }
 #endif
-    if (func == NULL)
-	return 0;
-    c = lkcstring_to_lkc(key);
-    if (c <= -1)
-	return 0;
-    else if (c >= 0) {
-	/* Remapping of key actions is supported only for basic
-	 * lynxkeycodes, without modifiers etc.!  If we get somehow
-	 * called for an invalid lynxkeycode, fail or silently ignore
-	 * modifiers. - kw
-	 */
-	if (c & (LKC_ISLECLAC | LKC_ISLAC))
-	    return 0;
-	if ((c & LKC_MASK) != c)
-	    c &= LKC_MASK;
-    }
-    if (c + 1 >= KEYMAP_SIZE)
-	return 0;
-    if ((mp = LYStringToKcmd(func)) != 0) {
+    if (func != NULL) {
+	c = lkcstring_to_lkc(key);
+	if ((c >= 0) && (c < KEYMAP_SIZE)) {
+	    /* Remapping of key actions is supported only for basic
+	     * lynxkeycodes, without modifiers etc.!  If we get somehow
+	     * called for an invalid lynxkeycode, fail or silently ignore
+	     * modifiers -KW
+	     */
+	    if (!(c & (LKC_ISLECLAC | LKC_ISLAC))) {
+		c &= LKC_MASK;
+		if ((mp = LYStringToKcmd(func)) != 0) {
 #if defined(DIRED_SUPPORT) && defined(OK_OVERRIDE)
-	if (for_dired)
-	    key_override[c + 1] = mp->code;
-	else
-#endif
-	    keymap[c + 1] = (LYKeymap_t) mp->code;
-	return (c ? c : (int) LAC_TO_LKC0(mp->code));	/* don't return 0, successful */
+		    if (for_dired)
+			key_override[c + 1] = mp->code;
+		    else
+#endif
+			keymap[c + 1] = (LYKeymap_t) mp->code;
+		    /* don't return 0, successful */
+		    result = (c ? c : (int) LAC_TO_LKC0(mp->code));
+		}
+	    }
+	}
     }
-    return 0;
+    return result;
 }
 
 typedef struct {
@@ -1529,6 +1527,7 @@
  */
 void LYinitKeymap(void)
 {
+    CTRACE((tfp, "LYinitKeymap\n"));
     initKeyMap(&myKeymapData);
 #if defined(DIRED_SUPPORT) && defined(OK_OVERRIDE)
     initKeyMap(&myOverrideData);
Index: src/LYLocal.c
--- 2.8.9dev.1/src/LYLocal.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYLocal.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYLocal.c,v 1.127 2013/11/28 11:19:31 tom Exp $
+ * $LynxId: LYLocal.c,v 1.128 2014/07/24 22:06:43 tom Exp $
  *
  *  Routines to manipulate the local filesystem.
  *  Written by: Rick Mallett, Carleton University
@@ -424,6 +424,7 @@
     char *tmpbuf = 0;
 
 #if defined(__DJGPP__) || defined(_WINDOWS)
+    (void) msg;
     stop_curses();
     HTSprintf0(&tmpbuf, "%s", path);
     for (n = 1; argv[n] != 0; n++)
@@ -466,7 +467,7 @@
 	/*NOTREACHED */
 
     default:			/* parent */
-#if !HAVE_WAITPID
+#ifndef HAVE_WAITPID
 	while (wait(&wstatus) != pid) ;		/* do nothing */
 #else
 	while (-1 == waitpid(pid, &wstatus, 0)) {	/* wait for child */
Index: src/LYMainLoop.c
--- 2.8.9dev.1/src/LYMainLoop.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYMainLoop.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.230 2013/11/28 11:20:34 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.232 2014/12/21 21:27:23 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -1549,21 +1549,23 @@
 	form = make;
     }
 
-    StrAllocCopy(save_submit_action, form->submit_action);
-    form->submit_action = HTPrompt(EDIT_SUBMIT_URL, form->submit_action);
+    if (form != 0) {
+	StrAllocCopy(save_submit_action, form->submit_action);
+	form->submit_action = HTPrompt(EDIT_SUBMIT_URL, form->submit_action);
 
-    if (isEmpty(form->submit_action) ||
-	(!isLYNXCGI(form->submit_action) &&
-	 StrNCmp(form->submit_action, "http", 4))) {
-	HTUserMsg(FORM_ACTION_NOT_HTTP_URL);
-    } else {
-	HTInfoMsg(SUBMITTING_FORM);
-	HText_SubmitForm(form, doc, form->name, form->value);
-	*refresh_screen = TRUE;
-    }
+	if (isEmpty(form->submit_action) ||
+	    (!isLYNXCGI(form->submit_action) &&
+	     StrNCmp(form->submit_action, "http", 4))) {
+	    HTUserMsg(FORM_ACTION_NOT_HTTP_URL);
+	} else {
+	    HTInfoMsg(SUBMITTING_FORM);
+	    HText_SubmitForm(form, doc, form->name, form->value);
+	    *refresh_screen = TRUE;
+	}
 
-    StrAllocCopy(form->submit_action, save_submit_action);
-    FREE(make);
+	StrAllocCopy(form->submit_action, save_submit_action);
+	FREE(make);
+    }
 }
 
 static void handle_LYK_RESET(int cur, BOOLEAN *refresh_screen)
@@ -3955,7 +3957,7 @@
 		      strcmp(CurrentNegoLanguage, NonNull(language)) ||
 		      strcmp(CurrentNegoCharset, NonNull(pref_charset))) &&
 		     (StrNCmp(curdoc.address, "http", 4) == 0 ||
-		      !isLYNXCGI(curdoc.address) == 0))) {
+		      isLYNXCGI(curdoc.address)))) {
 		    /*
 		     * An option has changed which may influence content
 		     * negotiation, and the resource is from a http or https or
Index: src/LYOptions.c
--- 2.8.9dev.1/src/LYOptions.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYOptions.c	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.164 2013/10/25 01:10:17 tom Exp $ */
+/* $LynxId: LYOptions.c,v 1.165 2014/12/21 21:27:45 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <HTTP.h>		/* 'reloading' flag */
@@ -3404,7 +3404,7 @@
      */
     if ((need_end_reload == TRUE &&
 	 (StrNCmp(newdoc->address, "http", 4) == 0 ||
-	  isLYNXCGI(newdoc->address) == 0))) {
+	  isLYNXCGI(newdoc->address)))) {
 	/*
 	 * An option has changed which may influence content negotiation, and
 	 * the resource is from a http or https or lynxcgi URL (the only
Index: src/LYPrint.c
--- 2.8.9dev.1/src/LYPrint.c	Wed Feb  5 00:50:18 2014
+++ 2.8.9dev.2/src/LYPrint.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYPrint.c,v 1.104 2014/02/04 01:58:51 tom Exp $
+ * $LynxId: LYPrint.c,v 1.105 2014/08/24 10:41:17 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -140,7 +140,14 @@
     char *cp;
 
     BStrCopy0(*filename, sug_filename);		/* add suggestion info */
-    BStrAlloc(*filename, LY_MAXPATH);	/* FIXME */
+    /*
+     * FIXME: the history-recall still uses fixed-size buffers
+     */
+    if ((*filename)->len >= LY_MAXPATH) {
+	(*filename)->str[LY_MAXPATH - 1] = '\0';
+    } else {
+	BStrAlloc(*filename, LY_MAXPATH);
+    }
     change_sug_filename((*filename)->str);
     if (!(HTisDocumentSource())
 	&& (cp = strrchr((*filename)->str, '.')) != NULL) {
Index: src/LYStrings.c
--- 2.8.9dev.1/src/LYStrings.c	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYStrings.c	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.258 2013/11/28 11:57:39 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.260 2014/12/09 01:49:18 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -1188,7 +1188,7 @@
     return result;
 }
 
-int map_string_to_keysym(const char *str, int *keysym)
+int map_string_to_keysym(const char *str, int *keysym, int internal)
 {
     int modifier = 0;
 
@@ -1259,7 +1259,9 @@
 	Keysym_String_List *k = lookupKeysymByName(str);
 
 	if (k != 0) {
-	    *keysym = k->value;
+	    *keysym = (internal
+		       ? k->internal
+		       : k->value);
 	}
     }
 
@@ -1347,7 +1349,7 @@
 	    }
 	    if (t != s)
 		*t = '\0';
-	    if (map_string_to_keysym(s, &keysym) >= 0) {
+	    if (map_string_to_keysym(s, &keysym, FALSE) >= 0) {
 		if (!unescape_string(parse, buf, buf + sizeof(buf) - 1)) {
 		    MY_TRACE((tfp, "KEYMAP(SKIP) could unescape key\n"));
 		    return 0;	/* Trace the failure and continue. */
@@ -1386,7 +1388,7 @@
 	{
 	    int keysym;
 
-	    if (map_string_to_keysym(parse, &keysym) >= 0)
+	    if (map_string_to_keysym(parse, &keysym, FALSE) >= 0)
 		define_key((char *) 0, keysym);
 	}
 #endif
@@ -1432,6 +1434,7 @@
     if ((fp = fopen(file, "r")) == 0)
 	return 0;
 
+    CTRACE((tfp, "read_keymap_file %s\n", file));
     linenum = 0;
     while (LYSafeGets(&line, fp) != 0) {
 	char *s = LYSkipBlanks(line);
Index: src/LYStrings.h
--- 2.8.9dev.1/src/LYStrings.h	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYStrings.h	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStrings.h,v 1.113 2013/10/20 20:33:23 tom Exp $
+ * $LynxId: LYStrings.h,v 1.114 2014/12/09 01:49:51 tom Exp $
  */
 #ifndef LYSTRINGS_H
 #define LYSTRINGS_H
@@ -324,7 +324,7 @@
 
 #if defined(USE_KEYMAPS)
     extern int lynx_initialize_keymaps(void);
-    extern int map_string_to_keysym(const char *src, int *lec);
+    extern int map_string_to_keysym(const char *src, int *lec, int internal);
 #endif
 
     extern BOOL LYRemapEditBinding(int xlkc, int lec, int select_edi);	/* in LYEditmap.c */
Index: src/LYUtils.c
--- 2.8.9dev.1/src/LYUtils.c	Sun Mar  9 21:43:10 2014
+++ 2.8.9dev.2/src/LYUtils.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.266 2014/03/09 14:27:06 tom Exp $
+ * $LynxId: LYUtils.c,v 1.272 2014/12/22 00:22:55 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -42,6 +42,8 @@
 #if !defined(kbhit) && defined(_WCONIO_DEFINED)
 #define kbhit() _kbhit()	/* reasonably recent conio.h */
 #endif
+#elif defined(__minix)
+#include <termios.h>		/* for struct winsize */
 
 #endif /* __MINGW32__ */
 
@@ -1782,7 +1784,8 @@
 	struct timeval tv;
 
 	gettimeofday(&tv, (struct timezone *) 0);
-	next = tv.tv_usec / 100000L;	/* 0.1 seconds is a compromise */
+	next = (tv.tv_sec * 10);
+	next += (tv.tv_usec / 100000L);		/* 0.1 seconds is a compromise */
     }
 #else
     next = time((time_t *) 0);
@@ -4584,7 +4587,7 @@
     return FALSE;
 }
 
-#if (!defined(__MINGW32__) && !defined(sleep)) || (defined(__MINGW32__) && !HAVE_SLEEP)
+#if (!defined(__MINGW32__) && !defined(sleep)) || (defined(__MINGW32__) && !defined(HAVE_SLEEP))
 void sleep(unsigned sec)
 {
     unsigned int i, j;
@@ -4633,13 +4636,6 @@
     BOOLEAN GotHost = FALSE;
     BOOLEAN Startup = (BOOL) (helpfilepath == NULL);
 
-#ifdef INET6
-    struct addrinfo hints, *res;
-    int error;
-    char *begin;
-    char *end = NULL;
-#endif /* INET6 */
-
     /*
      * If it's a NULL or zero-length string, or if it begins with a slash or
      * hash, don't continue pointlessly.  - FM
@@ -4703,22 +4699,7 @@
 	fprintf(stdout, "%s '%s'%s\r\n", WWW_FIND_MESSAGE, host, FIRST_SEGMENT);
     }
 #ifdef INET6
-    begin = host;
-    if (host[0] == '[' && ((end = strrchr(host, ']')))) {
-	/*
-	 * cut '[' and ']' from the IPv6 address, e.g. [::1]
-	 */
-	begin = host + 1;
-	*end = '\0';
-    }
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = PF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    error = getaddrinfo(begin, "80", &hints, &res);
-    if (end)
-	*end = ']';
-
-    if (!error && res)
+    if (HTGetAddrInfo(host, 80) != NULL)
 #else
     if (LYGetHostByName(host) != NULL)
 #endif /* INET6 */
@@ -7856,7 +7837,7 @@
 char *w32_strerror(DWORD ercode)
 {
 /*  __declspec(thread) necessary if you will use multiple threads */
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MINGW32__)
     static char msg_buff[256];
 
 #else
Index: src/LYUtils.h
--- 2.8.9dev.1/src/LYUtils.h	Fri Nov 29 00:52:56 2013
+++ 2.8.9dev.2/src/LYUtils.h	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-/* $LynxId: LYUtils.h,v 1.96 2013/11/28 11:22:53 tom Exp $ */
+/* $LynxId: LYUtils.h,v 1.98 2014/07/24 22:10:20 tom Exp $ */
 #ifndef LYUTILS_H
 #define LYUTILS_H
 
@@ -304,7 +304,7 @@
     extern void Define_VMSLogical(char *LogicalName, char *LogicalValue);
 #endif				/* VMS */
 
-#if ! HAVE_PUTENV
+#if !defined(HAVE_PUTENV)
     extern int putenv(const char *string);
 #endif				/* HAVE_PUTENV */
 
@@ -317,6 +317,11 @@
 
 #if defined(_WINDOWS)
     extern int win32_check_interrupt(void);
+
+#if (defined(__MINGW32__) && !defined(HAVE_SLEEP))
+#undef sleep
+    void sleep(unsigned sec);
+#endif
 #endif
 
     /*
Index: src/TRSTable.c
--- 2.8.9dev.1/src/TRSTable.c	Mon Jul 29 21:38:35 2013
+++ 2.8.9dev.2/src/TRSTable.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: TRSTable.c,v 1.31 2013/05/01 01:00:38 tom Exp $
+ * $LynxId: TRSTable.c,v 1.32 2014/12/16 01:30:48 tom Exp $
  *		Simple table object
  *		===================
  * Authors
@@ -201,9 +201,6 @@
  *    Anything that requires handling cell contents as paragraphs (block
  *    elements), like reflowing.  Vertical alignment.
  */
-static int Stbl_finishCellInRow(STable_rowinfo *me, STable_states *s, int end_td,
-				int lineno,
-				int pos);
 static int Stbl_finishRowInTable(STable_info *me);
 
 static const char *cellstate_s(cellstate_t state)
@@ -585,15 +582,17 @@
 		newstate = empty ? CS__0eb : CS__ebc;
 		s->state = newstate;
 		if (me->fixed_line) {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : -1);
+		    }
 		} else {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : 0);
+		    }
 		}
 		goto trace_and_return;
 	    case CS__0cb:
@@ -621,15 +620,17 @@
 		newstate = empty ? CS__eb : CS__ebc;
 		s->state = newstate;
 		if (me->fixed_line) {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : -1);
+		    }
 		} else {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : -1);
+		    }
 		}
 		goto trace_and_return;
 	    case CS__cb:
@@ -703,15 +704,17 @@
 		newstate = empty ? CS__0ef : CS__0cf;	/* ebc?? */
 		s->state = newstate;
 		if (me->fixed_line) {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : -1);
+		    }
 		} else {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : 0);
+		    }
 		}
 		goto trace_and_return;
 	    case CS__0cb:
@@ -751,15 +754,17 @@
 		newstate = empty ? CS__ef : CS__ef;	/* ##579??? !!!!! */
 		s->state = newstate;
 		if (me->fixed_line) {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : -1);
+		    }
 		} else {
-		    if (empty)
+		    if (empty) {
 			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    else
+		    } else {
 			ret = (lastcell->len <= 0 ? 0 : -1);
+		    }
 		}
 		goto trace_and_return;
 	    case CS__cb:
@@ -1451,8 +1456,9 @@
     if (!me->rows || !me->nrows)
 	return -1;		/* no row started! */
     /* ##850_fail_if_fail?? */
-    if (me->rows[me->nrows - 1].ended != ROW_not_ended)
+    if (me->rows[me->nrows - 1].ended != ROW_not_ended) {
 	Stbl_addRowToTable(me, alignment, lineno);
+    }
     Stbl_finishCellInTable(me, TRST_ENDCELL_ENDTD, lineno, 0, pos);
     lastrow = me->rows + (me->nrows - 1);
 
@@ -1462,7 +1468,9 @@
 	   appropriate amount of cells */
 	if (!NO_AGGRESSIVE_NEWROW && pos == 0 && lastrow->ncells > 0
 	    && lastrow->cells[lastrow->ncells - 1].cLine != lineno) {
-	    int rc = Stbl_fakeFinishCellInTable(me, lastrow, lineno, 0);
+	    int rc;
+
+	    rc = Stbl_fakeFinishCellInTable(me, lastrow, lineno, 0);
 
 	    if (rc < 0)
 		return -1;
@@ -1571,7 +1579,9 @@
 #ifdef EXP_NESTED_TABLES
     if (nested_tables) {
 	if (!NO_AGGRESSIVE_NEWROW && !(end_td & TRST_FAKING_CELLS)) {
-	    int rc = Stbl_fakeFinishCellInTable(me, lastrow, lineno, 1);
+	    int rc;
+
+	    rc = Stbl_fakeFinishCellInTable(me, lastrow, lineno, 1);
 
 	    if (rc) {
 		if (rc < 0)
@@ -1583,8 +1593,9 @@
     }
 #endif
     len = Stbl_finishCellInRow(lastrow, s, end_td, lineno, pos);
-    if (len == -1)
+    if (len == -1) {
 	return len;
+    }
     xlen = (len > 0) ? len : s->pending_len;	/* ##890 use xlen if fixed_line?: */
     if (lastrow->Line == lineno)
 	len = xlen;
@@ -1634,16 +1645,18 @@
     }
 #ifdef EXP_NESTED_TABLES	/* maxlen may already include contribution of a cell in this column */
     if (nested_tables) {
-	if (me->maxlen > MAX_STBL_POS)
+	if (me->maxlen > MAX_STBL_POS) {
 	    return -1;
+	}
     } else
 #endif
     {
 	if (me->maxlen + (xlen - len) > MAX_STBL_POS)
 	    return -1;
     }
-    if (me->maxpos > /* @@@ max. line length we can accept */ MAX_STBL_POS)
+    if (me->maxpos > /* @@@ max. line length we can accept */ MAX_STBL_POS) {
 	return -1;
+    }
 
     if (lineno != lastrow->Line) {
 	/* @@@ Do something here?  Or is it taken care of in
Index: src/UCAux.c
--- 2.8.9dev.1/src/UCAux.c	Sat Dec 11 15:26:32 2010
+++ 2.8.9dev.2/src/UCAux.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAux.c,v 1.44 2010/11/07 21:21:09 tom Exp $
+ * $LynxId: UCAux.c,v 1.50 2014/12/10 09:48:57 tom Exp $
  */
 #include <HTUtils.h>
 
@@ -31,10 +31,6 @@
 {
     if (to < 0)
 	return NO;
-/*???
-    if (!strcmp(LYCharSet_UC[to].MIMEname, "x-transparent"))
-       return NO;
-*/
 
     return YES;			/* well at least some characters... */
 }
@@ -564,10 +560,10 @@
  * returns the UCS value
  * returns negative value on error (invalid UTF-8 sequence)
  */
-UCode_t UCGetUniFromUtf8String(char **ppuni)
+UCode_t UCGetUniFromUtf8String(const char **ppuni)
 {
     UCode_t uc_out = 0;
-    char *p = *ppuni;
+    const char *p = *ppuni;
     int utf_count, i;
 
     if (!(**ppuni & 0x80))
@@ -626,4 +622,145 @@
     }
     *ppuni = p + utf_count;
     return uc_out;
+}
+
+/*
+ * Combine UTF-8 into Unicode.  Incomplete characters are either ignored, or
+ * returned as the UCS replacement character.
+ */
+dUTF8 HTDecodeUTF8(UTFDecodeState * me, int *c_in_out, UCode_t *result)
+{
+    dUTF8 rc = dUTF8_ok;
+    int c = *c_in_out;
+    unsigned uc = UCH(c);
+
+    if (TOASCII(uc) > 127) {
+	/*
+	 * continue a multibyte character...
+	 */
+	if (me->utf_count > 0 && (TOASCII(c) & 0xc0) == 0x80) {
+	    if (me->utf_count <= 0) {
+		me->utf_char = UCS_REPL;
+	    } else if (me->utf_count == 1) {
+		int limit = (int) (me->utf_buf_p - me->utf_buf) + 1;
+		int maybe = 0;
+
+		/*
+		 * Check for overlong sequences (from comment in xterm):
+		 *   1100000x 10xxxxxx
+		 *   11100000 100xxxxx 10xxxxxx
+		 *   11110000 1000xxxx 10xxxxxx 10xxxxxx
+		 *   11111000 10000xxx 10xxxxxx 10xxxxxx 10xxxxxx
+		 *   11111100 100000xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+		 */
+		switch (limit) {
+		case 2:
+		    maybe = (UCH(me->utf_buf[0]) & 0xfe) == 0xc0;
+		    break;
+		case 3:
+		    maybe = ((UCH(me->utf_buf[0]) == 0xe0) &&
+			     (UCH(me->utf_buf[1]) & 0xf0) == 0x80);
+		    break;
+		case 4:
+		    maybe = ((UCH(me->utf_buf[0]) == 0xf0) &&
+			     (UCH(me->utf_buf[1]) & 0xf8) == 0x80);
+		    break;
+		case 5:
+		    maybe = ((UCH(me->utf_buf[0]) == 0xf8) &&
+			     (UCH(me->utf_buf[1]) & 0xfd) == 0x80);
+		    break;
+		}
+		if (maybe) {
+		    while (limit-- > 2) {
+			if ((UCH(me->utf_buf[limit]) & 0xc0) != 0x80) {
+			    maybe = 0;
+			    break;
+			}
+		    }
+		    if (maybe) {
+			me->utf_char = UCS_REPL;
+		    }
+		}
+	    }
+	    if (me->utf_char == UCS_REPL) {
+		rc = dUTF8_err;
+	    } else if (me->utf_char || ((uc & 0x7f) >> (7 - me->utf_count))) {
+		me->utf_char = (me->utf_char << 6) | (TOASCII(c) & 0x3f);
+		if ((me->utf_char >= 0xd800 &&
+		     me->utf_char <= 0xdfff) ||
+		    (me->utf_char == 0xfffe) ||
+		    (me->utf_char == UCS_HIDE)) {
+		    me->utf_char = UCS_REPL;
+		    rc = dUTF8_err;
+		}
+	    } else {
+		me->utf_char = UCS_REPL;
+		rc = dUTF8_err;
+	    }
+	    me->utf_count--;
+	    *(me->utf_buf_p) = (char) c;
+	    (me->utf_buf_p)++;
+
+	    if (me->utf_count == 0) {
+		*(me->utf_buf_p) = '\0';
+		*result = me->utf_char;
+		if (*result < 256) {
+		    *c_in_out = UCH(*result & 0xff);
+		}
+		/* lynx does not use left-to-right */
+		if (*result == 0x200e)
+		    rc = dUTF8_err;
+	    } else {
+		rc = dUTF8_more;
+	    }
+	} else {
+	    /*
+	     * begin a multibyte character
+	     */
+	    rc = dUTF8_more;
+	    me->utf_buf_p = me->utf_buf;
+	    *(me->utf_buf_p) = (char) c;
+	    (me->utf_buf_p)++;
+	    if ((uc & 0xe0) == 0xc0) {
+		me->utf_count = 1;
+		me->utf_char = (uc & 0x1f);
+	    } else if ((uc & 0xf0) == 0xe0) {
+		me->utf_count = 2;
+		me->utf_char = (uc & 0x0f);
+	    } else if ((uc & 0xf8) == 0xf0) {
+		me->utf_count = 3;
+		me->utf_char = (uc & 0x07);
+	    } else if ((uc & 0xfc) == 0xf8) {
+		me->utf_count = 4;
+		me->utf_char = (uc & 0x03);
+	    } else if ((uc & 0xfe) == 0xfc) {
+		me->utf_count = 5;
+		me->utf_char = (uc & 0x01);
+	    } else {
+		me->utf_count = 0;
+		me->utf_buf_p = me->utf_buf;
+		*(me->utf_buf_p) = '\0';
+		rc = dUTF8_err;
+	    }
+	}
+    } else {
+	me->utf_count = 0;
+	me->utf_buf_p = me->utf_buf;
+	*(me->utf_buf_p) = '\0';
+    }
+
+#if 0
+    if (rc != dUTF8_ok) {
+	CTRACE((tfp, "UTF8 %#x ->%#x %s\n",
+		uc, UCH(*c_in_out),
+		(rc == dUTF8_err) ? "err" : "more"));
+    } else {
+	if (*result > 127) {
+	    CTRACE((tfp, "UTF8 %#x == %#x\n", uc, (int) *result));
+	} else if (c != UCS_REPL && !isspace(c)) {
+	    CTRACE((tfp, "CHAR %#x == %c (%#x)\n", uc, uc, (int) *result));
+	}
+    }
+#endif
+    return rc;
 }
Index: src/UCdomap.c
--- 2.8.9dev.1/src/UCdomap.c	Wed Feb  5 00:50:18 2014
+++ 2.8.9dev.2/src/UCdomap.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCdomap.c,v 1.96 2014/02/04 01:29:44 tom Exp $
+ * $LynxId: UCdomap.c,v 1.99 2014/12/10 09:47:34 tom Exp $
  *
  *  UCdomap.c
  *  =========
@@ -381,7 +381,7 @@
 		p++;
 	    }
 	} else {
-	    ptrans[i] = 0xfffd;
+	    ptrans[i] = UCS_REPL;
 	}
     }
     if (update_flag) {
@@ -475,7 +475,7 @@
 	    return ucError;
 
 	for (i = 0; i < 64; i++) {
-	    p2[i] = 0xffff;	/* No glyph for this character (yet) */
+	    p2[i] = UCS_HIDE;	/* No glyph for this character (yet) */
 	}
     }
 
@@ -718,7 +718,7 @@
 	/*
 	 * U+FFFD:  REPLACEMENT CHARACTER.
 	 */
-	ucs = 0xfffd;
+	ucs = UCS_REPL;
     } else if (ucs < 0x20 || ucs >= 0xfffe) {
 	/*
 	 * Not a printable character.
@@ -779,7 +779,7 @@
 	/*
 	 * U+FFFD:  REPLACEMENT CHARACTER.
 	 */
-	ucs = 0xfffd;
+	ucs = UCS_REPL;
 	/*
 	 * Maybe the following two cases should be allowed here??  - KW
 	 */
@@ -881,10 +881,10 @@
 	}
     }
     if (!isdefault && (rc == ucNotFound)) {
-	rc = conv_uni_to_pc(0xfffdL, 0);
+	rc = conv_uni_to_pc(UCS_REPL, 0);
     }
     if ((isdefault || trydefault) && (rc == ucNotFound)) {
-	rc = conv_uni_to_pc(0xfffdL, 1);
+	rc = conv_uni_to_pc(UCS_REPL, 1);
     }
     return rc;
 }
@@ -1018,17 +1018,17 @@
     }
     if (rc == ucNotFound) {
 	if (!isdefault)
-	    rc = conv_uni_to_str(outbuf, buflen, 0xfffdL, 0);
+	    rc = conv_uni_to_str(outbuf, buflen, UCS_REPL, 0);
 	if ((rc == ucNotFound) && (isdefault || trydefault))
-	    rc = conv_uni_to_str(outbuf, buflen, 0xfffdL, 1);
+	    rc = conv_uni_to_str(outbuf, buflen, UCS_REPL, 1);
 	if (rc >= 0)
 	    return (int) strlen(outbuf);
     }
     if (chk_single_flag && src == ucNotFound) {
 	if (!isdefault)
-	    rc = conv_uni_to_pc(0xfffdL, 0);
+	    rc = conv_uni_to_pc(UCS_REPL, 0);
 	if ((rc == ucNotFound) && (isdefault || trydefault))
-	    rc = conv_uni_to_pc(0xfffdL, 1);
+	    rc = conv_uni_to_pc(UCS_REPL, 1);
 	if (rc >= 32) {
 	    outbuf[0] = (char) rc;
 	    outbuf[1] = '\0';
@@ -1140,10 +1140,10 @@
 	rc = conv_uni_to_pc(unicode, 1);
     }
     if ((rc == ucNotFound) && !isdefault) {
-	rc = conv_uni_to_pc(0xfffdL, 0);
+	rc = conv_uni_to_pc(UCS_REPL, 0);
     }
     if ((rc == ucNotFound) && (isdefault || trydefault)) {
-	rc = conv_uni_to_pc(0xfffdL, 1);
+	rc = conv_uni_to_pc(UCS_REPL, 1);
     }
     return rc;
 }
@@ -1199,7 +1199,7 @@
     } else if (charset_in == UTF8_handle) {
 	if (is8bits(ch_iu)) {
 	    unsigned need;
-	    char *ptr;
+	    const char *ptr;
 
 	    buffer[inx++] = (char) ch_iu;
 	    buffer[inx] = '\0';
@@ -1453,17 +1453,17 @@
     }
     if (rc == ucNotFound) {
 	if (!isdefault)
-	    rc = conv_uni_to_str(outbuf, buflen, 0xfffdL, 0);
+	    rc = conv_uni_to_str(outbuf, buflen, UCS_REPL, 0);
 	if ((rc == ucNotFound) && (isdefault || trydefault))
-	    rc = conv_uni_to_str(outbuf, buflen, 0xfffdL, 1);
+	    rc = conv_uni_to_str(outbuf, buflen, UCS_REPL, 1);
 	if (rc >= 0)
 	    return (int) strlen(outbuf);
     }
     if (chk_single_flag && src == ucNotFound) {
 	if (!isdefault)
-	    rc = conv_uni_to_pc(0xfffdL, 0);
+	    rc = conv_uni_to_pc(UCS_REPL, 0);
 	if ((rc == ucNotFound) && (isdefault || trydefault))
-	    rc = conv_uni_to_pc(0xfffdL, 1);
+	    rc = conv_uni_to_pc(UCS_REPL, 1);
 	if (rc >= 32) {
 	    outbuf[0] = (char) rc;
 	    outbuf[1] = '\0';
Index: src/makefile.in
--- 2.8.9dev.1/src/makefile.in	Wed Feb  5 00:50:18 2014
+++ 2.8.9dev.2/src/makefile.in	Mon Dec 22 01:39:40 2014
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.73 2014/01/19 14:41:13 tom Exp $
+# $LynxId: makefile.in,v 1.74 2014/12/16 01:10:39 tom Exp $
 # template-makefile for Lynx src directory
 
 SHELL		= @CONFIG_SHELL@
@@ -140,6 +140,7 @@
 
 CMN=$(top_srcdir)/WWW/Library/Implementation/
 
+GridText$o :		$(top_srcdir)/userdefs.h
 HTFWriter$o :		$(top_srcdir)/userdefs.h
 HTInit$o :		$(top_srcdir)/userdefs.h
 LYCharSets$o :		$(top_srcdir)/userdefs.h
Index: src/tidy_tls.c
--- 2.8.9dev.1/src/tidy_tls.c	Sat Jan 11 19:06:15 2014
+++ 2.8.9dev.2/src/tidy_tls.c	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: tidy_tls.c,v 1.22 2014/01/11 17:34:51 tom Exp $
+ * $LynxId: tidy_tls.c,v 1.24 2014/11/30 23:28:13 tom Exp $
  * Copyright 2008-2013,2014 Thomas E. Dickey
  * with fix Copyright 2008 by Thomas Viehmann
  *
@@ -11,7 +11,11 @@
 #include <tidy_tls.h>
 
 #include <gnutls/x509.h>
+#ifdef HAVE_GNUTLS_RND
+#include <gnutls/crypto.h>
+#else
 #include <gcrypt.h>
+#endif
 #include <libtasn1.h>		/* ASN1_SUCCESS,etc */
 #include <string.h>
 
@@ -95,8 +99,15 @@
  */
 int RAND_bytes(unsigned char *buffer, int num)
 {
+    int rc;
+
+#ifdef HAVE_GNUTLS_RND
+    rc = gnutls_rnd(GNUTLS_RND_KEY, buffer, num);
+#else
     gcry_randomize(buffer, num, GCRY_VERY_STRONG_RANDOM);
-    return 1;
+    rc = 1;
+#endif
+    return rc;
 }
 
 /*
Index: userdefs.h
--- 2.8.9dev.1/userdefs.h	Wed Mar 12 19:14:45 2014
+++ 2.8.9dev.2/userdefs.h	Mon Dec 22 01:39:40 2014
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.295 2014/03/10 22:07:34 tom Exp $
+ * $LynxId: userdefs.h,v 1.297 2014/03/16 15:03:40 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -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.1"
+#define LYNX_VERSION "2.8.9dev.2"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Wed, 12 Mar 2014 12:14:45 -0700"
+#define LYNX_DATE "Sun, 21 Dec 2014 17:39:40 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 
