about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--INSTALLATION20
-rw-r--r--WWW/Library/Implementation/HTFTP.c5
-rw-r--r--WWW/Library/Implementation/HTFile.c87
-rw-r--r--WWW/Library/Implementation/HTFile.h4
-rw-r--r--WWW/Library/Implementation/HTFormat.c251
-rw-r--r--WWW/Library/Implementation/HTFormat.h24
-rw-r--r--WWW/Library/Implementation/HTTP.c5
-rw-r--r--aclocal.m422
-rw-r--r--config.hin4
-rwxr-xr-xconfigure9092
-rw-r--r--configure.in18
-rw-r--r--lynx.cfg3
-rw-r--r--src/HTFWriter.c48
-rw-r--r--src/LYOptions.c5
-rw-r--r--src/LYReadCFG.c3
-rw-r--r--src/LYrcFile.c6
-rw-r--r--src/LYrcFile.h3
18 files changed, 5498 insertions, 4107 deletions
diff --git a/CHANGES b/CHANGES
index e892edd7..536a4556 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
--- $LynxId: CHANGES,v 1.1104 2022/03/12 16:16:34 tom Exp $
+-- $LynxId: CHANGES,v 1.1106 2022/03/29 23:53:57 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2022-03-12 (2.9.0dev.11)
+2022-03-29 (2.9.0dev.11)
+* changes for using brotli stream decompression -TD
 * changes for working with SOCKS5 on Windows 10 -GV, -TD
 * fix a few coverity and clang warnings -TD
 * add a null-pointer check in StrAllocVsprintf() to work with existing SOCKS5
diff --git a/INSTALLATION b/INSTALLATION
index 86a408cd..bd227b91 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -296,10 +296,12 @@ II. Compile instructions -- UNIX
   	Use this option to control whether full pathnames are compiled in for
 	various utilities invoked by lynx as external commands.  By default,
 	full pathnames are compiled in for the the locations where configure
-	finds these commands at configure time.  Affected commands are chmod,
-	compress, cp, gzip, install, mkdir, mv, rm, tar, touch, gunzip, unzip,
-	bzip2, uudecode, zcat, zip, telnet, tn3270, rlogin.  (Not all of them
-	are used on all systems or in all configurations.)
+	finds these commands at configure time.
+	
+	Affected commands include
+		chmod compress cp gzip install mkdir mv rm tar touch gunzip
+		unzip brotli bzip2 uudecode zcat zip telnet tn3270 rlogin
+	(Not all commands are used on all systems or in all configurations.)
 
 	This option makes Lynx simpler to install, but potentially less secure,
 	since the commands are then set in the user's $PATH.  All of these
@@ -574,6 +576,14 @@ II. Compile instructions -- UNIX
 	This option allows you to specify the X libraries used if you
 	are configuring lynx to use PDCurses on a Unix platform.
 
+  --with-brotli[=XXX]			(define USE_BROTLI)
+	Use brotli decompression.
+
+	The optional value XXX specifies the directory in which the library
+	can be found, and may be either the path of the "lib" directory,
+	or one level above.  In either case, the corresponding header files
+	are assumed to be in the parallel "include" directory.
+
   --with-build-cc=XXX
 	If cross-compiling, specify a host C compiler, which is needed to
 	compile a utility which generates tables for lynx.
@@ -1496,4 +1506,4 @@ VIII. Acknowledgment
 
 -- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
 -- vile:txtmode
--- $LynxId: INSTALLATION,v 1.135 2021/07/02 00:15:34 tom Exp $
+-- $LynxId: INSTALLATION,v 1.136 2021/07/29 23:35:35 tom Exp $
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 092c2076..cb058cc9 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.143 2022/03/12 12:06:13 tom Exp $
+ * $LynxId: HTFTP.c,v 1.144 2022/03/17 20:04:17 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -4089,6 +4089,9 @@ int HTFTPLoad(const char *name,
 	    case cftBzip2:
 		StrAllocCopy(anchor->content_encoding, "x-bzip2");
 		break;
+	    case cftBrotli:
+		StrAllocCopy(anchor->content_encoding, "x-brotli");
+		break;
 	    case cftNone:
 		break;
 	    }
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 1624e5c2..4da14c1a 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.152 2019/08/16 22:53:10 tom Exp $
+ * $LynxId: HTFile.c,v 1.153 2022/03/29 23:48:38 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -1281,9 +1281,14 @@ CompressFileType HTCompressFileType(const char *filename,
 	len = strlen(filename);
 	ftype = filename + len;
 
-	if ((len > 4)
-	    && !strcasecomp((ftype - 3), "bz2")
-	    && StrChr(dots, ftype[-4]) != 0) {
+	if ((len > 3)
+	    && !strcasecomp((ftype - 2), "br")
+	    && StrChr(dots, ftype[-3]) != 0) {
+	    result = cftBrotli;
+	    ftype -= 3;
+	} else if ((len > 4)
+		   && !strcasecomp((ftype - 3), "bz2")
+		   && StrChr(dots, ftype[-4]) != 0) {
 	    result = cftBzip2;
 	    ftype -= 4;
 	} else if ((len > 3)
@@ -1335,6 +1340,9 @@ const char *HTCompressTypeToSuffix(CompressFileType method)
     case cftDeflate:
 	result = ".zz";
 	break;
+    case cftBrotli:
+	result = ".br";
+	break;
     }
     return result;
 }
@@ -1363,6 +1371,9 @@ const char *HTCompressTypeToEncoding(CompressFileType method)
     case cftDeflate:
 	result = "deflate";
 	break;
+    case cftBrotli:
+	result = "brotli";
+	break;
     }
     return result;
 }
@@ -1390,6 +1401,10 @@ CompressFileType HTEncodingToCompressType(const char *coding)
     } else if (!strcasecomp(coding, "bzip2") ||
 	       !strcasecomp(coding, "x-bzip2")) {
 	result = cftBzip2;
+    } else if (!strcasecomp(coding, "br") ||	/* actual */
+	       !strcasecomp(coding, "brotli") ||	/* expected */
+	       !strcasecomp(coding, "x-brotli")) {
+	result = cftBrotli;
     } else if (!strcasecomp(coding, "deflate") ||
 	       !strcasecomp(coding, "x-deflate")) {
 	result = cftDeflate;
@@ -1412,6 +1427,10 @@ CompressFileType HTContentTypeToCompressType(const char *ct)
     } else if (!strncasecomp(ct, "application/bzip2", 17) ||
 	       !strncasecomp(ct, "application/x-bzip2", 19)) {
 	method = cftBzip2;
+    } else if (!strncasecomp(ct, "application/br", 14) ||
+	       !strncasecomp(ct, "application/brotli", 18) ||
+	       !strncasecomp(ct, "application/x-brotli", 20)) {
+	method = cftBrotli;
     }
     return method;
 }
@@ -2420,6 +2439,15 @@ static BOOL isBzip2Stream(FILE *fp)
 #define DOT_STRING "."
 #endif
 
+#ifdef USE_BROTLI
+static FILE *
+brotli_open(const char *localname, const char *mode)
+{
+    CTRACE((tfp, "brotli_open file=%s, mode=%s\n", localname, mode));
+    return fopen(localname, mode);
+}
+#endif
+
 static int decompressAndParse(HTParentAnchor *anchor,
 			      HTFormat format_out,
 			      HTStream *sink,
@@ -2437,7 +2465,10 @@ static int decompressAndParse(HTParentAnchor *anchor,
 #endif /* USE_ZLIB */
 #ifdef USE_BZLIB
     BZFILE *bzfp = 0;
-#endif /* USE_ZLIB */
+#endif /* USE_BZLIB */
+#ifdef USE_BROTLI
+    FILE *brfp = 0;
+#endif /* USE_BROTLI */
 #if defined(USE_ZLIB) || defined(USE_BZLIB)
     CompressFileType internal_decompress = cftNone;
     BOOL failed_decompress = NO;
@@ -2536,6 +2567,17 @@ static int decompressAndParse(HTParentAnchor *anchor,
 		internal_decompress = cftBzip2;
 	    } else
 #endif /* USE_BZLIB */
+#ifdef USE_BROTLI
+	    if (isDOWNLOAD(cftBrotli)) {
+		fclose(fp);
+		fp = 0;
+		brfp = brotli_open(localname, BIN_R);
+
+		CTRACE((tfp, "HTLoadFile: brotli_open of `%s' gives %p\n",
+			localname, (void *) brfp));
+		internal_decompress = cftBrotli;
+	    } else
+#endif /* USE_BROTLI */
 	    {
 		StrAllocCopy(anchor->content_type, format->name);
 		StrAllocCopy(anchor->content_encoding, HTAtom_name(myEncoding));
@@ -2614,6 +2656,22 @@ static int decompressAndParse(HTParentAnchor *anchor,
 		format = HTAtom_for("www/compressed");
 #endif /* USE_BZLIB */
 		break;
+	    case cftBrotli:
+		StrAllocCopy(anchor->content_encoding, "x-brotli");
+#ifdef USE_BROTLI
+		if (strcmp(format_out->name, "www/download") != 0) {
+		    fclose(fp);
+		    fp = 0;
+		    brfp = brotli_open(localname, BIN_R);
+
+		    CTRACE((tfp, "HTLoadFile: brotli_open of `%s' gives %p\n",
+			    localname, (void *) brfp));
+		    internal_decompress = cftBrotli;
+		}
+#else /* USE_BROTLI */
+		format = HTAtom_for("www/compressed");
+#endif /* USE_BROTLI */
+		break;
 	    case cftNone:
 		break;
 	    }
@@ -2635,6 +2693,11 @@ static int decompressAndParse(HTParentAnchor *anchor,
 		failed_decompress = (BOOLEAN) (bzfp == NULL);
 		break;
 #endif
+#ifdef USE_BROTLI
+	    case cftBrotli:
+		failed_decompress = (BOOLEAN) (brfp == NULL);
+		break;
+#endif
 	    default:
 		failed_decompress = YES;
 		break;
@@ -2666,6 +2729,12 @@ static int decompressAndParse(HTParentAnchor *anchor,
 		if (sugfname && *sugfname)
 		    StrAllocCopy(anchor->SugFname, sugfname);
 		FREE(sugfname);
+#ifdef USE_BROTLI
+		if (brfp)
+		    *statusp = HTParseBrFile(format, format_out,
+					     anchor,
+					     brfp, sink);
+#endif
 #ifdef USE_BZLIB
 		if (bzfp)
 		    *statusp = HTParseBzFile(format, format_out,
@@ -2954,6 +3023,9 @@ int HTLoadFile(const char *addr,
 			case cftBzip2:
 			    atomname = "application/x-bzip2";
 			    break;
+			case cftBrotli:
+			    atomname = "application/x-brotli";
+			    break;
 			case cftNone:
 			    break;
 			}
@@ -3182,6 +3254,11 @@ void HTInitProgramPaths(BOOL init)
 
     for (n = (int) ppUnknown + 1; n < (int) pp_Last; ++n) {
 	switch (code = (ProgramPaths) n) {
+#ifdef BROTLI_PATH
+	case ppBROTLI:
+	    path = BROTLI_PATH;
+	    break;
+#endif
 #ifdef BZIP2_PATH
 	case ppBZIP2:
 	    path = BZIP2_PATH;
diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h
index 204f5404..0bdfb794 100644
--- a/WWW/Library/Implementation/HTFile.h
+++ b/WWW/Library/Implementation/HTFile.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.h,v 1.34 2020/01/21 22:08:07 tom Exp $
+ * $LynxId: HTFile.h,v 1.35 2021/07/29 22:54:21 tom Exp $
  *							File access in libwww
  *				FILE ACCESS
  *
@@ -213,6 +213,7 @@ extern "C" {
 	,cftGzip
 	,cftBzip2
 	,cftDeflate
+	,cftBrotli
     } CompressFileType;
 
 /*
@@ -307,6 +308,7 @@ extern "C" {
  */
     typedef enum {
 	ppUnknown = 0
+	,ppBROTLI
 	,ppBZIP2
 	,ppCHMOD
 	,ppCOMPRESS
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index a1ad71ae..4f48e5d5 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.c,v 1.92 2022/03/12 14:40:38 tom Exp $
+ * $LynxId: HTFormat.c,v 1.95 2022/03/30 00:29:50 tom Exp $
  *
  *		Manage different file formats			HTFormat.c
  *		=============================
@@ -57,6 +57,10 @@ static float HTMaxSecs = 1e10;	/* No effective limit */
 #include <LYMainLoop.h>
 #endif
 
+#ifdef USE_BROTLI
+#include <brotli/decode.h>
+#endif
+
 BOOL HTOutputSource = NO;	/* Flag: shortcut parser to stdout */
 
 /* this version used by the NetToText stream */
@@ -375,6 +379,8 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 					  HTPresentation *fill_in,
 					  HTParentAnchor *anchor)
 {
+#undef THIS_FUNC
+#define THIS_FUNC "HTFindPresentation"
     HTAtom *wildcard = NULL;	/* = HTAtom_for("*"); lookup when needed - kw */
     int n;
     int i;
@@ -385,7 +391,7 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
     HTPresentation *last_default_match = 0;
     HTPresentation *strong_subtype_wildcard_match = 0;
 
-    CTRACE((tfp, "HTFormat: Looking up presentation for %s to %s\n",
+    CTRACE((tfp, THIS_FUNC ": Looking up presentation for %s to %s\n",
 	    HTAtom_name(rep_in), HTAtom_name(rep_out)));
 
     n = HTList_count(HTPresentations);
@@ -395,7 +401,7 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 	    if (pres->rep_out == rep_out) {
 		if (failsMailcap(pres, anchor))
 		    continue;
-		CTRACE((tfp, "FindPresentation: found exact match: %s -> %s\n",
+		CTRACE((tfp, THIS_FUNC ": found exact match: %s -> %s\n",
 			HTAtom_name(pres->rep),
 			HTAtom_name(pres->rep_out)));
 		return pres;
@@ -411,8 +417,8 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 		    if (!strong_wildcard_match)
 			strong_wildcard_match = pres;
 		    /* otherwise use the first one */
-		    CTRACE((tfp,
-			    "StreamStack: found strong wildcard match: %s -> %s\n",
+		    CTRACE((tfp, THIS_FUNC
+			    ": found strong wildcard match: %s -> %s\n",
 			    HTAtom_name(pres->rep),
 			    HTAtom_name(pres->rep_out)));
 		}
@@ -429,8 +435,8 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 		if (!strong_subtype_wildcard_match)
 		    strong_subtype_wildcard_match = pres;
 		/* otherwise use the first one */
-		CTRACE((tfp,
-			"StreamStack: found strong subtype wildcard match: %s -> %s\n",
+		CTRACE((tfp, THIS_FUNC
+			": found strong subtype wildcard match: %s -> %s\n",
 			HTAtom_name(pres->rep),
 			HTAtom_name(pres->rep_out)));
 	    }
@@ -444,7 +450,7 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 		    weak_wildcard_match = pres;
 		/* otherwise use the first one */
 		CTRACE((tfp,
-			"StreamStack: found weak wildcard match: %s\n",
+			THIS_FUNC ": found weak wildcard match: %s\n",
 			HTAtom_name(pres->rep_out)));
 
 	    } else if (!last_default_match) {
@@ -476,6 +482,7 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
     }
 
     return NULL;
+#undef THIS_FUNC
 }
 
 /*		Create a filter stack
@@ -493,11 +500,13 @@ HTStream *HTStreamStack(HTFormat rep_in,
 			HTStream *sink,
 			HTParentAnchor *anchor)
 {
+#undef THIS_FUNC
+#define THIS_FUNC "HTStreamStack"
     HTPresentation temp;
     HTPresentation *match;
     HTStream *result;
 
-    CTRACE((tfp, "StreamStack: Constructing stream stack for %s to %s (%s)\n",
+    CTRACE((tfp, THIS_FUNC ": Constructing stream stack for %s to %s (%s)\n",
 	    HTAtom_name(rep_in),
 	    HTAtom_name(rep_out),
 	    NONNULL(anchor->content_type_params)));
@@ -507,9 +516,9 @@ HTStream *HTStreamStack(HTFormat rep_in,
 
     } else if ((match = HTFindPresentation(rep_in, rep_out, &temp, anchor))) {
 	if (match == &temp) {
-	    CTRACE((tfp, "StreamStack: Using %s\n", HTAtom_name(temp.rep_out)));
+	    CTRACE((tfp, THIS_FUNC ": Using %s\n", HTAtom_name(temp.rep_out)));
 	} else {
-	    CTRACE((tfp, "StreamStack: found exact match: %s -> %s\n",
+	    CTRACE((tfp, THIS_FUNC ": found exact match: %s -> %s\n",
 		    HTAtom_name(match->rep),
 		    HTAtom_name(match->rep_out)));
 	}
@@ -519,15 +528,16 @@ HTStream *HTStreamStack(HTFormat rep_in,
     }
     if (TRACE) {
 	if (result && result->isa && result->isa->name) {
-	    CTRACE((tfp, "StreamStack: Returning \"%s\"\n", result->isa->name));
+	    CTRACE((tfp, THIS_FUNC ": Returning \"%s\"\n", result->isa->name));
 	} else if (result) {
-	    CTRACE((tfp, "StreamStack: Returning *unknown* stream!\n"));
+	    CTRACE((tfp, THIS_FUNC ": Returning *unknown* stream!\n"));
 	} else {
-	    CTRACE((tfp, "StreamStack: Returning NULL!\n"));
+	    CTRACE((tfp, THIS_FUNC ": Returning NULL!\n"));
 	    CTRACE_FLUSH(tfp);	/* a crash may be imminent... - kw */
 	}
     }
     return result;
+#undef THIS_FUNC
 }
 
 /*		Put a presentation near start of list
@@ -590,7 +600,7 @@ void HTFilterPresentations(void)
 /*		Find the cost of a filter stack
  *		-------------------------------
  *
- *	Must return the cost of the same stack which StreamStack would set up.
+ *	Must return the cost of the same stack which HTStreamStack would set up.
  *
  * On entry,
  *	length	The size of the data to be converted
@@ -1330,6 +1340,142 @@ static int HTBzFileCopy(BZFILE * bzfp, HTStream *sink)
 }
 #endif /* USE_BZLIB */
 
+#ifdef USE_BROTLI
+/*	Push data from a brotli file pointer down a stream
+ *	-------------------------------------
+ *
+ *   This routine is responsible for creating and PRESENTING any
+ *   graphic (or other) objects described by the file.
+ *
+ *
+ *  State of file and target stream on entry:
+ *		      BZFILE (bzfp) assumed open (should have bzipped content),
+ *		      target (sink) assumed valid.
+ *
+ *  Return values:
+ *	HT_INTERRUPTED  Interruption after some data read.
+ *	HT_PARTIAL_CONTENT	Error after some data read.
+ *	-1		Error before any data read.
+ *	HT_LOADED	Normal end of file indication on reading.
+ *
+ *  State of file and target stream on return:
+ *	always		bzfp still open, target stream still valid.
+ */
+static int HTBrFileCopy(FILE *brfp, HTStream *sink)
+{
+#undef THIS_FUNC
+#define THIS_FUNC "HTBrFileCopy"
+    HTStreamClass targetClass;
+    int status;
+    off_t bytes;
+    int rv = HT_OK;
+    BrotliDecoderResult status2 = BROTLI_DECODER_RESULT_ERROR;
+
+    char *brotli_buffer = NULL;
+    char *normal_buffer = NULL;
+    size_t brotli_size;
+    size_t brotli_limit = 0;
+    size_t brotli_offset = brotli_limit;
+    size_t normal_size;
+    size_t normal_limit = 0;
+
+    /*  Push the data down the stream
+     */
+    targetClass = *(sink->isa);	/* Copy pointers to procedures */
+
+    /*  read and inflate brotli'd file, and push binary down sink
+     */
+    HTReadProgress(bytes = 0, (off_t) 0);
+    /*
+     * first, read all of the brotli'd file into memory, to work with the
+     * library's limitations.
+     */
+    for (;;) {
+	size_t input_chunk = INPUT_BUFFER_SIZE;
+
+	brotli_offset = brotli_limit;
+	brotli_limit += input_chunk;
+	brotli_buffer = realloc(brotli_buffer, brotli_limit);
+	if (brotli_buffer == NULL)
+	    outofmem(__FILE__, THIS_FUNC);
+	status = (int) fread(brotli_buffer + brotli_offset, sizeof(char),
+			     input_chunk, brfp);
+
+	if (status <= 0) {	/* EOF or error */
+	    if (status == 0) {
+		rv = HT_LOADED;
+		break;
+	    }
+	    CTRACE((tfp, THIS_FUNC ": Read error, fread returns %d\n", status));
+	    if (bytes) {
+		if (!feof(brfp))
+		    rv = HT_PARTIAL_CONTENT;
+	    } else {
+		rv = -1;
+	    }
+	    break;
+	}
+	bytes += status;
+    }
+
+    /*
+     * next, unless we encountered an error (and have no data), try
+     * decompressing with increasing output buffer sizes until the brotli
+     * library succeeds.
+     */
+    if (bytes > 0) {
+	do {
+	    if (normal_limit == 0)
+		normal_limit = (10 * brotli_limit) + INPUT_BUFFER_SIZE;
+	    else
+		normal_limit *= 2;
+	    normal_buffer = realloc(normal_buffer, normal_limit);
+	    if (normal_buffer == NULL)
+		outofmem(__FILE__, THIS_FUNC);
+	    brotli_size = (size_t) bytes;
+	    normal_size = normal_limit;
+	    status2 = BrotliDecoderDecompress(brotli_size,
+					      (uint8_t *) brotli_buffer,
+					      &normal_size,
+					      (uint8_t *) normal_buffer);
+	    /*
+	     * brotli library should return
+	     *  BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT,
+	     * but actually returns
+	     *  BROTLI_DECODER_RESULT_ERROR 
+	     *
+	     * Accommodate possible improvements...
+	     */
+	} while (status2 != BROTLI_DECODER_RESULT_SUCCESS);
+    }
+
+    /*
+     * finally, pump that data into the output stream.
+     */
+    if (status2 == BROTLI_DECODER_RESULT_SUCCESS) {
+	CTRACE((tfp, THIS_FUNC ": decompressed %ld -> %ld (1:%.1f)\n",
+		brotli_size, normal_size,
+		(double) normal_size / (double) brotli_size));
+	(*targetClass.put_block) (sink, normal_buffer, (int) normal_size);
+	bytes += status;
+	HTReadProgress(bytes, (off_t) -1);
+	HTDisplayPartial();
+
+	if (HTCheckForInterrupt()) {
+	    _HTProgress(TRANSFER_INTERRUPTED);
+	    rv = HT_INTERRUPTED;
+	}
+    }
+    free(brotli_buffer);
+    free(normal_buffer);
+
+    /* next bufferload */
+    HTFinishDisplayPartial();
+    return rv;
+#undef THIS_FUNC
+}
+#endif /* USE_BZLIB */
+
 /*	Push data from a socket down a stream STRIPPING CR
  *	--------------------------------------------------
  *
@@ -1817,6 +1963,81 @@ int HTParseBzFile(HTFormat rep_in,
 }
 #endif /* USE_BZLIB */
 
+#ifdef USE_BROTLI
+/*	HTParseBrFile
+ *
+ *  State of file and target stream on entry:
+ *			FILE* (brfp) assumed open,
+ *			target (sink) usually NULL (will call stream stack).
+ *
+ *  Return values:
+ *	-501		Stream stack failed (cannot present or convert).
+ *	-1		Download cancelled.
+ *	HT_NO_DATA	Error before any data read.
+ *	HT_PARTIAL_CONTENT	Interruption or error after some data read.
+ *	HT_LOADED	Normal end of file indication on reading.
+ *
+ *  State of file and target stream on return:
+ *	always		bzfp closed; target freed, aborted, or NULL.
+ */
+int HTParseBrFile(HTFormat rep_in,
+		  HTFormat format_out,
+		  HTParentAnchor *anchor,
+		  FILE *brfp,
+		  HTStream *sink)
+{
+    HTStream *stream;
+    HTStreamClass targetClass;
+    int rv;
+    int result;
+
+    stream = HTStreamStack(rep_in, format_out, sink, anchor);
+
+    if (!stream || !stream->isa) {
+	char *buffer = 0;
+
+	fclose(brfp);
+	if (LYCancelDownload) {
+	    LYCancelDownload = FALSE;
+	    result = -1;
+	} else {
+	    HTSprintf0(&buffer, CANNOT_CONVERT_I_TO_O,
+		       HTAtom_name(rep_in), HTAtom_name(format_out));
+	    CTRACE((tfp, "HTFormat(in HTParseBzFile): %s\n", buffer));
+	    rv = HTLoadError(sink, 501, buffer);
+	    FREE(buffer);
+	    result = rv;
+	}
+    } else {
+
+	/*
+	 * Push the data down the stream
+	 *
+	 * @@ Bug:  This decision ought to be made based on "encoding" rather than
+	 * on content-type.  @@@ When we handle encoding.  The current method
+	 * smells anyway.
+	 */
+	targetClass = *(stream->isa);	/* Copy pointers to procedures */
+	rv = HTBrFileCopy(brfp, stream);
+	if (rv == -1 || rv == HT_INTERRUPTED) {
+	    (*targetClass._abort) (stream, NULL);
+	} else {
+	    (*targetClass._free) (stream);
+	}
+
+	fclose(brfp);
+	if (rv == -1) {
+	    result = HT_NO_DATA;
+	} else if (rv == HT_INTERRUPTED || (rv > 0 && rv != HT_LOADED)) {
+	    result = HT_PARTIAL_CONTENT;
+	} else {
+	    result = HT_LOADED;
+	}
+    }
+    return result;
+}
+#endif /* USE_BROTLI */
+
 /*	Converter stream: Network Telnet to internal character text
  *	-----------------------------------------------------------
  *
diff --git a/WWW/Library/Implementation/HTFormat.h b/WWW/Library/Implementation/HTFormat.h
index 20e718a8..76a8b253 100644
--- a/WWW/Library/Implementation/HTFormat.h
+++ b/WWW/Library/Implementation/HTFormat.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.h,v 1.37 2020/01/21 22:02:59 tom Exp $
+ * $LynxId: HTFormat.h,v 1.38 2022/03/28 08:09:44 tom Exp $
  *
  *                                            HTFormat: The format manager in the WWW Library
  *                          MANAGE DIFFERENT DOCUMENT FORMATS
@@ -229,10 +229,12 @@ The HTPresentation and HTConverter types
 	,encodingDEFLATE = 2
 	,encodingCOMPRESS = 4
 	,encodingBZIP2 = 8
+	,encodingBROTLI = 16
 	,encodingALL = (encodingGZIP
 			+ encodingDEFLATE
 			+ encodingCOMPRESS
-			+ encodingBZIP2)
+			+ encodingBZIP2
+			+ encodingBROTLI)
     } AcceptEncoding;
 
 /*
@@ -512,7 +514,7 @@ HTParseZzFile: Parse a deflate'd File through a file pointer
 HTParseBzFile: Parse a bzip2'ed File through a file pointer
 
    This routine is called by protocols modules to load an object.  uses
-   HTStreamStack and HTGzFileCopy.  Returns HT_LOADED if successful, can also
+   HTStreamStack and HTBzFileCopy.  Returns HT_LOADED if successful, can also
    return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure.
  */
     extern int HTParseBzFile(HTFormat format_in,
@@ -523,6 +525,22 @@ HTParseBzFile: Parse a bzip2'ed File through a file pointer
 
 #endif				/* USE_BZLIB */
 
+#ifdef USE_BROTLI
+/*
+HTParseBzFile: Parse a brotli'ed File through a file pointer
+
+   This routine is called by protocols modules to load an object.  uses
+   HTStreamStack and HTBrFileCopy.  Returns HT_LOADED if successful, can also
+   return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure.
+ */
+    extern int HTParseBrFile(HTFormat format_in,
+			     HTFormat format_out,
+			     HTParentAnchor *anchor,
+			     FILE * brfp,
+			     HTStream *sink);
+
+#endif				/* USE_BROTLI */
+
 /*
 
 HTNetToText: Convert Net ASCII to local representation
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index e405e46f..46f1924e 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.181 2021/11/04 22:15:26 Sylvain.Bertrand Exp $
+ * $LynxId: HTTP.c,v 1.182 2022/03/17 20:02:41 tom Exp $
  *
  * HyperText Transfer Protocol	- Client implementation		HTTP.c
  * ===========================
@@ -710,6 +710,9 @@ static BOOL acceptEncoding(int code)
 	case encodingBZIP2:
 	    program = HTGetProgramPath(ppBZIP2);
 	    break;
+	case encodingBROTLI:
+	    program = HTGetProgramPath(ppBROTLI);
+	    break;
 	default:
 	    break;
 	}
diff --git a/aclocal.m4 b/aclocal.m4
index 3d82beae..f0edbdfc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.306 2022/01/28 13:32:11 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.307 2022/03/17 19:59:12 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>
@@ -7211,6 +7211,26 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl Check for Brotli decoder library
+dnl
+dnl $1 = optional path for headers/library
+AC_DEFUN([CF_WITH_BROTLI],[
+  CF_ADD_OPTIONAL_PATH($1)
+
+  CF_FIND_LINKAGE([
+#include <brotli/decode.h>
+],[
+    BrotliDecoderDecompressStream(
+		NULL,	/* BrotliDecoderState* state */
+		NULL,	/* size_t* available_in */
+		NULL,	/* const uint8_t** next_in */
+		NULL,	/* size_t* available_out */
+		NULL,	/* uint8_t** next_out */
+		NULL	/* size_t* total_out */
+	);
+],brotlidec,,,brotlilib)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_BZLIB version: 4 updated: 2007/07/29 13:19:54
 dnl -------------
 dnl Check for libbz2 aka "bzlib"
diff --git a/config.hin b/config.hin
index 057fa548..d59f34e3 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.151 2021/07/05 13:25:57 tom Exp $
+ * $LynxId: config.hin,v 1.152 2021/07/29 23:16:41 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -12,6 +12,7 @@
 #undef ALL_CHARSETS		/* AC_ARG_WITH(charsets) */
 #undef ALT_CHAR_SET		/* CF_ALT_CHAR_SET */
 #undef ARCHIVE_ONLY		/* CF_ARG_DISABLE(dired-archive) */
+#undef BROTLI_PATH		/* CF_PATH_PROG(brotli) */
 #undef BZIP2_PATH		/* CF_PATH_PROG(bzip2) */
 #undef CAN_SET_ERRNO		/* CF_SET_ERRNO */
 #undef CHMOD_PATH		/* CF_PATH_PROG(chmod) */
@@ -268,6 +269,7 @@
 #undef USE_ADDRLIST_PAGE	/* CF_ARG_DISABLE(addrlist-page) */
 #undef USE_ALT_BINDINGS		/* CF_ARG_DISABLE(alt-bindings) */
 #undef USE_ASCII_CTYPES		/* CF_ARG_DISABLE(ascii-ctypes) */
+#undef USE_BROTLI		/* AC_ARG_WITH(brotli) */
 #undef USE_BZLIB		/* AC_ARG_WITH(bzlib) */
 #undef USE_CACHEJAR		/* CF_ARG_DISABLE(session-cache) */
 #undef USE_CHARSET_CHOICE	/* CF_ARG_DISABLE(charset-choice) */
diff --git a/configure b/configure
index e2fc6055..4ff984c0 100755
--- a/configure
+++ b/configure
@@ -802,6 +802,7 @@ Miscellaneous Options:
   --enable-gzip-help      install gzip'ed help files
   --with-bzlib            use libbz2 for decompression of some bzip2 files
   --with-zlib             use zlib for decompression of some gzip files
+  --with-brotli           use brotli decompression
 Other Network Services:
   --disable-finger        disable FINGER logic
   --disable-gopher        disable GOPHER logic
@@ -1021,7 +1022,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1024: loading site script $ac_site_file" >&5
+    { echo "$as_me:1025: 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"
@@ -1032,7 +1033,7 @@ if test -r "$cache_file"; then
   # 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:1035: loading cache $cache_file" >&5
+    { echo "$as_me:1036: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1040,7 +1041,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1043: creating cache $cache_file" >&5
+  { echo "$as_me:1044: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1056,21 +1057,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1059: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1060: 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:1063: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1064: 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:1069: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1070: 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:1071:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1072:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1073:   current value: $ac_new_val" >&5
+        { echo "$as_me:1074:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1089,9 +1090,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1092: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1093: 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:1094: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1095: 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
@@ -1120,10 +1121,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1123: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1124: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1126: \$? = $ac_status" >&5
+  echo "$as_me:1127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1158,7 +1159,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1161: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1162: 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
@@ -1168,11 +1169,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1171: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1172: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1175: checking build system type" >&5
+echo "$as_me:1176: 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
@@ -1181,23 +1182,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1184: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1185: 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:1188: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1189: 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:1193: result: $ac_cv_build" >&5
+echo "$as_me:1194: 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:1200: checking host system type" >&5
+echo "$as_me:1201: 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
@@ -1206,12 +1207,12 @@ else
 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:1209: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1210: 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:1214: result: $ac_cv_host" >&5
+echo "$as_me:1215: 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/'`
@@ -1219,7 +1220,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:1222: checking target system type" >&5
+	echo "$as_me:1223: 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
@@ -1228,12 +1229,12 @@ else
 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:1231: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1232: 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:1236: result: $ac_cv_target" >&5
+echo "$as_me:1237: 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/'`
@@ -1265,13 +1266,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1268: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1269: 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:1272: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1273: 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:1274: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1275: 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
@@ -1279,7 +1280,7 @@ fi
 # 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:1282: WARNING: overriding system type $host_os to $withval" >&5
+  { echo "$as_me:1283: 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;
@@ -1301,7 +1302,7 @@ PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
 VERSION=2.9.0dev.11
 
-echo "$as_me:1304: checking for DESTDIR" >&5
+echo "$as_me:1305: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
 
 # Check whether --with-destdir or --without-destdir was given.
@@ -1337,7 +1338,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:1340: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:1341: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -1346,7 +1347,7 @@ esac
 fi
 eval DESTDIR="$withval"
 
-echo "$as_me:1349: result: $DESTDIR" >&5
+echo "$as_me:1350: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 case "$host_os" in
@@ -1365,7 +1366,7 @@ ac_main_return="return"
 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:1368: checking for $ac_word" >&5
+echo "$as_me:1369: 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
@@ -1380,7 +1381,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1383: found $ac_dir/$ac_word" >&5
+echo "$as_me:1384: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1388,10 +1389,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1391: result: $CC" >&5
+  echo "$as_me:1392: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1394: result: no" >&5
+  echo "$as_me:1395: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1400,7 +1401,7 @@ if test -z "$ac_cv_prog_CC"; then
   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:1403: checking for $ac_word" >&5
+echo "$as_me:1404: 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
@@ -1415,7 +1416,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1418: found $ac_dir/$ac_word" >&5
+echo "$as_me:1419: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1423,10 +1424,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1426: result: $ac_ct_CC" >&5
+  echo "$as_me:1427: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1429: result: no" >&5
+  echo "$as_me:1430: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1439,7 +1440,7 @@ if test -z "$CC"; then
   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:1442: checking for $ac_word" >&5
+echo "$as_me:1443: 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
@@ -1454,7 +1455,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1457: found $ac_dir/$ac_word" >&5
+echo "$as_me:1458: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1462,10 +1463,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1465: result: $CC" >&5
+  echo "$as_me:1466: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1468: result: no" >&5
+  echo "$as_me:1469: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1474,7 +1475,7 @@ if test -z "$ac_cv_prog_CC"; then
   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:1477: checking for $ac_word" >&5
+echo "$as_me:1478: 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
@@ -1489,7 +1490,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1492: found $ac_dir/$ac_word" >&5
+echo "$as_me:1493: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1497,10 +1498,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1500: result: $ac_ct_CC" >&5
+  echo "$as_me:1501: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1503: result: no" >&5
+  echo "$as_me:1504: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1513,7 +1514,7 @@ fi
 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:1516: checking for $ac_word" >&5
+echo "$as_me:1517: 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
@@ -1533,7 +1534,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1536: found $ac_dir/$ac_word" >&5
+echo "$as_me:1537: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1555,10 +1556,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1558: result: $CC" >&5
+  echo "$as_me:1559: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1561: result: no" >&5
+  echo "$as_me:1562: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1569,7 +1570,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1572: checking for $ac_word" >&5
+echo "$as_me:1573: 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
@@ -1584,7 +1585,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1587: found $ac_dir/$ac_word" >&5
+echo "$as_me:1588: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1592,10 +1593,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1595: result: $CC" >&5
+  echo "$as_me:1596: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1598: result: no" >&5
+  echo "$as_me:1599: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1608,7 +1609,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1611: checking for $ac_word" >&5
+echo "$as_me:1612: 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
@@ -1623,7 +1624,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1626: found $ac_dir/$ac_word" >&5
+echo "$as_me:1627: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1631,10 +1632,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1634: result: $ac_ct_CC" >&5
+  echo "$as_me:1635: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1637: result: no" >&5
+  echo "$as_me:1638: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1646,32 +1647,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1649: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1650: 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:1654:" \
+echo "$as_me:1655:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1657: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1658: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1660: \$? = $ac_status" >&5
+  echo "$as_me:1661: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1662: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1663: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1665: \$? = $ac_status" >&5
+  echo "$as_me:1666: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1667: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1668: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1670: \$? = $ac_status" >&5
+  echo "$as_me:1671: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1674 "configure"
+#line 1675 "configure"
 #include "confdefs.h"
 
 int
@@ -1687,13 +1688,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # 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:1690: checking for C compiler default output" >&5
+echo "$as_me:1691: 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:1693: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1694: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1696: \$? = $ac_status" >&5
+  echo "$as_me:1697: \$? = $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
@@ -1716,34 +1717,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1719: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1720: 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:1725: result: $ac_file" >&5
+echo "$as_me:1726: 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:1730: checking whether the C compiler works" >&5
+echo "$as_me:1731: 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:1736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1739: \$? = $ac_status" >&5
+  echo "$as_me:1740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1746: error: cannot run C compiled programs.
+	{ { echo "$as_me:1747: 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;}
@@ -1751,24 +1752,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1754: result: yes" >&5
+echo "$as_me:1755: 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:1761: checking whether we are cross compiling" >&5
+echo "$as_me:1762: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1763: result: $cross_compiling" >&5
+echo "$as_me:1764: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1766: checking for executable suffix" >&5
+echo "$as_me:1767: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1771: \$? = $ac_status" >&5
+  echo "$as_me:1772: \$? = $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
@@ -1784,25 +1785,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1787: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1788: 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:1793: result: $ac_cv_exeext" >&5
+echo "$as_me:1794: 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:1799: checking for object suffix" >&5
+echo "$as_me:1800: 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 1805 "configure"
+#line 1806 "configure"
 #include "confdefs.h"
 
 int
@@ -1814,10 +1815,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1818: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1820: \$? = $ac_status" >&5
+  echo "$as_me:1821: \$? = $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
@@ -1829,24 +1830,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1832: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1833: 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:1839: result: $ac_cv_objext" >&5
+echo "$as_me:1840: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1843: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1844: 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 1849 "configure"
+#line 1850 "configure"
 #include "confdefs.h"
 
 int
@@ -1861,16 +1862,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1867: \$? = $ac_status" >&5
+  echo "$as_me:1868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1873: \$? = $ac_status" >&5
+  echo "$as_me:1874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1882,19 +1883,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1885: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1886: 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:1891: checking whether $CC accepts -g" >&5
+echo "$as_me:1892: 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 1897 "configure"
+#line 1898 "configure"
 #include "confdefs.h"
 
 int
@@ -1906,16 +1907,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1912: \$? = $ac_status" >&5
+  echo "$as_me:1913: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1918: \$? = $ac_status" >&5
+  echo "$as_me:1919: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1925,7 +1926,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1928: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1929: 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
@@ -1952,16 +1953,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1958: \$? = $ac_status" >&5
+  echo "$as_me:1959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1964: \$? = $ac_status" >&5
+  echo "$as_me:1965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1973,7 +1974,7 @@ if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1976 "configure"
+#line 1977 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1986,16 +1987,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1992: \$? = $ac_status" >&5
+  echo "$as_me:1993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1998: \$? = $ac_status" >&5
+  echo "$as_me:1999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2005,7 +2006,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2008 "configure"
+#line 2009 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2017,16 +2018,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2023: \$? = $ac_status" >&5
+  echo "$as_me:2024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2029: \$? = $ac_status" >&5
+  echo "$as_me:2030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2056,11 +2057,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2059: checking version of $CC" >&5
+	echo "$as_me:2060: 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:2063: result: $GCC_VERSION" >&5
+	echo "$as_me:2064: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2069,12 +2070,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2072: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2073: 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 2077 "configure"
+#line 2078 "configure"
 #include "confdefs.h"
 
 int
@@ -2091,16 +2092,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2095: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2097: \$? = $ac_status" >&5
+  echo "$as_me:2098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2103: \$? = $ac_status" >&5
+  echo "$as_me:2104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2111,7 +2112,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2114: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2115: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2120,11 +2121,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2123: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2124: 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"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2127 "configure"
+#line 2128 "configure"
 #include "confdefs.h"
 
 int
@@ -2141,16 +2142,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2147: \$? = $ac_status" >&5
+  echo "$as_me:2148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2153: \$? = $ac_status" >&5
+  echo "$as_me:2154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2160,7 +2161,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2163: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2164: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2169,30 +2170,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2172: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2173: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2179: checking version of $CC" >&5
+	echo "$as_me:2180: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2183: result: $CLANG_VERSION" >&5
+	echo "$as_me:2184: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2190: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2191: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2195 "configure"
+#line 2196 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2206,16 +2207,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2212: \$? = $ac_status" >&5
+  echo "$as_me:2213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2218: \$? = $ac_status" >&5
+  echo "$as_me:2219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2226,13 +2227,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2229: result: $cf_clang_optok" >&5
+		echo "$as_me:2230: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2235: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2236: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2241,7 +2242,7 @@ echo "${as_me:-configure}:2235: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2244: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2245: 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
@@ -2249,7 +2250,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2252 "configure"
+#line 2253 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2298,16 +2299,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2304: \$? = $ac_status" >&5
+  echo "$as_me:2305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2310: \$? = $ac_status" >&5
+  echo "$as_me:2311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2324,10 +2325,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2327: result: none needed" >&5
+    echo "$as_me:2328: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2330: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2331: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2335,13 +2336,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2338: checking \$CFLAGS variable" >&5
+echo "$as_me:2339: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2342: result: broken" >&5
+	echo "$as_me:2343: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2344: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2345: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
 	cf_flags="$CFLAGS"
 	CFLAGS=
@@ -2449,18 +2450,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2452: result: ok" >&5
+	echo "$as_me:2453: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2457: checking \$CC variable" >&5
+echo "$as_me:2458: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2461: result: broken" >&5
+	echo "$as_me:2462: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2463: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2464: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
@@ -2577,19 +2578,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2580: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2581: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2584: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2585: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2588: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2589: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2592: result: ok" >&5
+	echo "$as_me:2593: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2598,7 +2599,7 @@ for ac_prog in ggrep grep
 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:2601: checking for $ac_word" >&5
+echo "$as_me:2602: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2613,7 +2614,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2616: found $ac_dir/$ac_word" >&5
+echo "$as_me:2617: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2621,10 +2622,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2624: result: $GREP" >&5
+  echo "$as_me:2625: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2627: result: no" >&5
+  echo "$as_me:2628: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2632,7 +2633,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2635: checking for egrep" >&5
+echo "$as_me:2636: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2644,7 +2645,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2647: checking for $ac_word" >&5
+echo "$as_me:2648: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2661,7 +2662,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2664: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2665: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2672,10 +2673,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2675: result: $EGREP" >&5
+  echo "$as_me:2676: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2678: result: no" >&5
+  echo "$as_me:2679: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2683,12 +2684,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2686: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2687: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2691: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2692: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2698,7 +2699,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
-echo "$as_me:2701: checking how to run the C preprocessor" >&5
+echo "$as_me:2702: 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
@@ -2719,18 +2720,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2722 "configure"
+#line 2723 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2727: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2728: \"$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:2733: \$? = $ac_status" >&5
+  echo "$as_me:2734: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2753,17 +2754,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2756 "configure"
+#line 2757 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2760: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2761: \"$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:2766: \$? = $ac_status" >&5
+  echo "$as_me:2767: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2800,7 +2801,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2803: result: $CPP" >&5
+echo "$as_me:2804: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2810,18 +2811,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2813 "configure"
+#line 2814 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2818: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2819: \"$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:2824: \$? = $ac_status" >&5
+  echo "$as_me:2825: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2844,17 +2845,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2847 "configure"
+#line 2848 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2851: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2852: \"$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:2857: \$? = $ac_status" >&5
+  echo "$as_me:2858: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2882,7 +2883,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2885: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2886: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2894,7 +2895,7 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:2897: checking if preprocessor -C option works" >&5
+echo "$as_me:2898: checking if preprocessor -C option works" >&5
 echo $ECHO_N "checking if preprocessor -C option works... $ECHO_C" >&6
 if test "${cf_cv_prog_cpp_comments+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2919,34 +2920,34 @@ rm -f conftest.[ci]
 
 fi
 
-echo "$as_me:2922: result: $cf_cv_prog_cpp_comments" >&5
+echo "$as_me:2923: result: $cf_cv_prog_cpp_comments" >&5
 echo "${ECHO_T}$cf_cv_prog_cpp_comments" >&6
 if test x$cf_cv_prog_cpp_comments = xyes
 then
 	CPP="$CPP -C"
 fi
 
-echo "$as_me:2929: checking whether ln -s works" >&5
+echo "$as_me:2930: 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:2933: result: yes" >&5
+  echo "$as_me:2934: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2936: result: no, using $LN_S" >&5
+  echo "$as_me:2937: 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:2943: result: Override: No symbolic links in mingw." >&5
+echo "$as_me:2944: result: Override: No symbolic links in mingw." >&5
 echo "${ECHO_T}Override: No symbolic links in mingw." >&6
 	;;
 (*)
 	;;
 esac
-echo "$as_me:2949: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2950: 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
@@ -2966,11 +2967,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2969: result: yes" >&5
+  echo "$as_me:2970: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2973: result: no" >&5
+  echo "$as_me:2974: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2987,7 +2988,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2990: checking for a BSD compatible install" >&5
+echo "$as_me:2991: 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
@@ -3036,7 +3037,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3039: result: $INSTALL" >&5
+echo "$as_me:3040: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3051,7 +3052,7 @@ for ac_prog in byacc 'bison -y'
 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:3054: checking for $ac_word" >&5
+echo "$as_me:3055: 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
@@ -3066,7 +3067,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:3069: found $ac_dir/$ac_word" >&5
+echo "$as_me:3070: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3074,10 +3075,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:3077: result: $YACC" >&5
+  echo "$as_me:3078: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:3080: result: no" >&5
+  echo "$as_me:3081: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3085,7 +3086,7 @@ fi
 done
 test -n "$YACC" || YACC="yacc"
 
-echo "$as_me:3088: checking for egrep" >&5
+echo "$as_me:3089: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3097,7 +3098,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3100: checking for $ac_word" >&5
+echo "$as_me:3101: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3114,7 +3115,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:3117: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3118: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3125,10 +3126,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:3128: result: $EGREP" >&5
+  echo "$as_me:3129: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:3131: result: no" >&5
+  echo "$as_me:3132: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3136,12 +3137,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:3139: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:3140: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3144: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:3145: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -3149,7 +3150,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3152: checking for $ac_word" >&5
+echo "$as_me:3153: 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
@@ -3164,7 +3165,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3167: found $ac_dir/$ac_word" >&5
+echo "$as_me:3168: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3172,10 +3173,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3175: result: $LINT" >&5
+  echo "$as_me:3176: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3178: result: no" >&5
+  echo "$as_me:3179: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3188,7 +3189,7 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3191: checking for fgrep" >&5
+echo "$as_me:3192: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3200,7 +3201,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3203: checking for $ac_word" >&5
+echo "$as_me:3204: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3217,7 +3218,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:3220: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3221: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3228,10 +3229,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:3231: result: $FGREP" >&5
+  echo "$as_me:3232: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:3234: result: no" >&5
+  echo "$as_me:3235: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3239,16 +3240,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3242: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3243: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3247: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:3248: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:3251: checking for makeflags variable" >&5
+echo "$as_me:3252: 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
@@ -3278,7 +3279,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:3281: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:3282: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -3286,10 +3287,10 @@ echo "${as_me:-configure}:3281: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:3289: result: $cf_cv_makeflags" >&5
+echo "$as_me:3290: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:3292: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3293: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3344,14 +3345,14 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3347: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3348: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
 test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
 test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
 
-echo "$as_me:3354: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3355: 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
@@ -3378,7 +3379,7 @@ else
 fi
 
 fi
-echo "$as_me:3381: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3382: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3389,7 +3390,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3392: checking for $ac_word" >&5
+echo "$as_me:3393: 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
@@ -3404,7 +3405,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:3407: found $ac_dir/$ac_word" >&5
+echo "$as_me:3408: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3412,10 +3413,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3415: result: $CTAGS" >&5
+  echo "$as_me:3416: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3418: result: no" >&5
+  echo "$as_me:3419: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3426,7 +3427,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3429: checking for $ac_word" >&5
+echo "$as_me:3430: 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
@@ -3441,7 +3442,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:3444: found $ac_dir/$ac_word" >&5
+echo "$as_me:3445: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3449,10 +3450,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3452: result: $ETAGS" >&5
+  echo "$as_me:3453: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3455: result: no" >&5
+  echo "$as_me:3456: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3461,7 +3462,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3464: checking for $ac_word" >&5
+echo "$as_me:3465: 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
@@ -3476,7 +3477,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3479: found $ac_dir/$ac_word" >&5
+echo "$as_me:3480: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3485,17 +3486,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3488: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3489: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3491: result: no" >&5
+  echo "$as_me:3492: 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:3498: checking for $ac_word" >&5
+echo "$as_me:3499: 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
@@ -3510,7 +3511,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3513: found $ac_dir/$ac_word" >&5
+echo "$as_me:3514: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3519,10 +3520,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3522: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3523: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3525: result: no" >&5
+  echo "$as_me:3526: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3545,7 +3546,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:3548: checking for $ac_word" >&5
+echo "$as_me:3549: 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
@@ -3562,7 +3563,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:3565: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3566: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3573,10 +3574,10 @@ fi
 WINDRES=$ac_cv_path_WINDRES
 
 if test -n "$WINDRES"; then
-  echo "$as_me:3576: result: $WINDRES" >&5
+  echo "$as_me:3577: result: $WINDRES" >&5
 echo "${ECHO_T}$WINDRES" >&6
 else
-  echo "$as_me:3579: result: no" >&5
+  echo "$as_me:3580: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3585,7 +3586,7 @@ if test -z "$ac_cv_path_WINDRES"; then
   ac_pt_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-echo "$as_me:3588: checking for $ac_word" >&5
+echo "$as_me:3589: 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
@@ -3602,7 +3603,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:3605: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3606: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3614,10 +3615,10 @@ fi
 ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
 
 if test -n "$ac_pt_WINDRES"; then
-  echo "$as_me:3617: result: $ac_pt_WINDRES" >&5
+  echo "$as_me:3618: result: $ac_pt_WINDRES" >&5
 echo "${ECHO_T}$ac_pt_WINDRES" >&6
 else
-  echo "$as_me:3620: result: no" >&5
+  echo "$as_me:3621: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3645,7 +3646,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3648: checking for $ac_word" >&5
+echo "$as_me:3649: 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
@@ -3660,7 +3661,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:3663: found $ac_dir/$ac_word" >&5
+echo "$as_me:3664: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3668,10 +3669,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:3671: result: $BUILD_CC" >&5
+  echo "$as_me:3672: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:3674: result: no" >&5
+  echo "$as_me:3675: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3680,12 +3681,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:3683: checking for native build C compiler" >&5
+	echo "$as_me:3684: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:3685: result: $BUILD_CC" >&5
+	echo "$as_me:3686: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:3688: checking for native build C preprocessor" >&5
+	echo "$as_me:3689: 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.
@@ -3695,10 +3696,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:3698: result: $BUILD_CPP" >&5
+	echo "$as_me:3699: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:3701: checking for native build C flags" >&5
+	echo "$as_me:3702: 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.
@@ -3706,10 +3707,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:3709: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:3710: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:3712: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:3713: 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.
@@ -3717,10 +3718,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:3720: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:3721: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:3723: checking for native build linker-flags" >&5
+	echo "$as_me:3724: 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.
@@ -3728,10 +3729,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:3731: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:3732: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:3734: checking for native build linker-libraries" >&5
+	echo "$as_me:3735: 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.
@@ -3739,7 +3740,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:3742: result: $BUILD_LIBS" >&5
+	echo "$as_me:3743: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -3749,7 +3750,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 	: ${BUILD_CC:='${CC}'}
 
 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
-		{ { echo "$as_me:3752: error: Cross-build requires two compilers.
+		{ { echo "$as_me:3753: 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;}
@@ -3770,7 +3771,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3773: checking for $ac_word" >&5
+echo "$as_me:3774: 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
@@ -3785,7 +3786,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3788: found $ac_dir/$ac_word" >&5
+echo "$as_me:3789: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3793,10 +3794,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3796: result: $RANLIB" >&5
+  echo "$as_me:3797: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3799: result: no" >&5
+  echo "$as_me:3800: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3805,7 +3806,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3808: checking for $ac_word" >&5
+echo "$as_me:3809: 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
@@ -3820,7 +3821,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3823: found $ac_dir/$ac_word" >&5
+echo "$as_me:3824: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3829,10 +3830,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3832: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3833: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3835: result: no" >&5
+  echo "$as_me:3836: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3844,7 +3845,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3847: checking for $ac_word" >&5
+echo "$as_me:3848: 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
@@ -3859,7 +3860,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:3862: found $ac_dir/$ac_word" >&5
+echo "$as_me:3863: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3867,10 +3868,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3870: result: $AR" >&5
+  echo "$as_me:3871: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3873: result: no" >&5
+  echo "$as_me:3874: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3879,7 +3880,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:3882: checking for $ac_word" >&5
+echo "$as_me:3883: 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
@@ -3894,7 +3895,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:3897: found $ac_dir/$ac_word" >&5
+echo "$as_me:3898: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3903,10 +3904,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3906: result: $ac_ct_AR" >&5
+  echo "$as_me:3907: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3909: result: no" >&5
+  echo "$as_me:3910: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3915,7 +3916,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3918: checking for options to update archives" >&5
+echo "$as_me:3919: 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
@@ -3952,13 +3953,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 3955 "configure"
+#line 3956 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:3958: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:3959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3961: \$? = $ac_status" >&5
+  echo "$as_me:3962: \$? = $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
@@ -3969,7 +3970,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:3972: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3973: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -3979,7 +3980,7 @@ echo "${as_me:-configure}:3972: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:3982: result: $cf_cv_ar_flags" >&5
+echo "$as_me:3983: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -3990,7 +3991,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:3993: checking if you want to see long compiling messages" >&5
+echo "$as_me:3994: 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.
@@ -4024,7 +4025,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:4027: result: $enableval" >&5
+echo "$as_me:4028: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -4034,7 +4035,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:4037: checking if you want to check memory-leaks" >&5
+echo "$as_me:4038: 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.
@@ -4051,7 +4052,7 @@ else
 	with_leak_checks=no
 
 fi;
-echo "$as_me:4054: result: $with_leak_checks" >&5
+echo "$as_me:4055: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -4061,7 +4062,7 @@ EOF
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
-echo "$as_me:4064: checking if you want to enable debug-code" >&5
+echo "$as_me:4065: 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.
@@ -4078,7 +4079,7 @@ else
 	with_debug=no
 
 fi;
-echo "$as_me:4081: result: $with_debug" >&5
+echo "$as_me:4082: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case "$host_os" in
@@ -4103,7 +4104,7 @@ else
 	esac
 fi
 
-echo "$as_me:4106: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:4107: 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.
@@ -4120,14 +4121,14 @@ else
 	with_trace=yes
 
 fi;
-echo "$as_me:4123: result: $with_trace" >&5
+echo "$as_me:4124: 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:4130: checking if you want verbose trace code" >&5
+echo "$as_me:4131: 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.
@@ -4144,7 +4145,7 @@ else
 	with_vertrace=no
 
 fi;
-echo "$as_me:4147: result: $with_vertrace" >&5
+echo "$as_me:4148: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test "$with_vertrace" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4153,7 +4154,7 @@ EOF
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:4156: checking for X" >&5
+	echo "$as_me:4157: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -4257,17 +4258,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4260 "configure"
+#line 4261 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:4264: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4265: \"$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:4270: \$? = $ac_status" >&5
+  echo "$as_me:4271: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4300,7 +4301,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4303 "configure"
+#line 4304 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -4312,16 +4313,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4318: \$? = $ac_status" >&5
+  echo "$as_me:4319: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4324: \$? = $ac_status" >&5
+  echo "$as_me:4325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -4359,7 +4360,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:4362: result: $have_x" >&5
+  echo "$as_me:4363: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -4369,7 +4370,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:4372: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:4373: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -4396,11 +4397,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:4399: checking whether -R must be followed by a space" >&5
+      echo "$as_me:4400: 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 4403 "configure"
+#line 4404 "configure"
 #include "confdefs.h"
 
 int
@@ -4412,16 +4413,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4418: \$? = $ac_status" >&5
+  echo "$as_me:4419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4424: \$? = $ac_status" >&5
+  echo "$as_me:4425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -4431,13 +4432,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:4434: result: no" >&5
+	echo "$as_me:4435: 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 4440 "configure"
+#line 4441 "configure"
 #include "confdefs.h"
 
 int
@@ -4449,16 +4450,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4455: \$? = $ac_status" >&5
+  echo "$as_me:4456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4461: \$? = $ac_status" >&5
+  echo "$as_me:4462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -4468,11 +4469,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:4471: result: yes" >&5
+	  echo "$as_me:4472: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:4475: result: neither works" >&5
+	  echo "$as_me:4476: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -4492,7 +4493,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 4495 "configure"
+#line 4496 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4511,22 +4512,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4515: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4517: \$? = $ac_status" >&5
+  echo "$as_me:4518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4523: \$? = $ac_status" >&5
+  echo "$as_me:4524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:4529: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:4530: 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
@@ -4534,7 +4535,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4537 "configure"
+#line 4538 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4553,16 +4554,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4559: \$? = $ac_status" >&5
+  echo "$as_me:4560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4565: \$? = $ac_status" >&5
+  echo "$as_me:4566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -4573,14 +4574,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4576: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:4577: 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:4583: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:4584: 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
@@ -4588,7 +4589,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4591 "configure"
+#line 4592 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4607,16 +4608,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4613: \$? = $ac_status" >&5
+  echo "$as_me:4614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4619: \$? = $ac_status" >&5
+  echo "$as_me:4620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -4627,7 +4628,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4630: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:4631: 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"
@@ -4646,13 +4647,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:4649: checking for gethostbyname" >&5
+    echo "$as_me:4650: 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 4655 "configure"
+#line 4656 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4683,16 +4684,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4689: \$? = $ac_status" >&5
+  echo "$as_me:4690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4695: \$? = $ac_status" >&5
+  echo "$as_me:4696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -4702,11 +4703,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4705: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:4706: 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:4709: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:4710: 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
@@ -4714,7 +4715,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4717 "configure"
+#line 4718 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4733,16 +4734,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4736: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4739: \$? = $ac_status" >&5
+  echo "$as_me:4740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4745: \$? = $ac_status" >&5
+  echo "$as_me:4746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -4753,14 +4754,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4756: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:4757: 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:4763: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:4764: 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
@@ -4768,7 +4769,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4771 "configure"
+#line 4772 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4787,16 +4788,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4793: \$? = $ac_status" >&5
+  echo "$as_me:4794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4799: \$? = $ac_status" >&5
+  echo "$as_me:4800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -4807,7 +4808,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4810: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:4811: 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"
@@ -4823,13 +4824,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:4826: checking for connect" >&5
+    echo "$as_me:4827: 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 4832 "configure"
+#line 4833 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4860,16 +4861,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4866: \$? = $ac_status" >&5
+  echo "$as_me:4867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4872: \$? = $ac_status" >&5
+  echo "$as_me:4873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -4879,11 +4880,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4882: result: $ac_cv_func_connect" >&5
+echo "$as_me:4883: 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:4886: checking for connect in -lsocket" >&5
+      echo "$as_me:4887: 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
@@ -4891,7 +4892,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4894 "configure"
+#line 4895 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4910,16 +4911,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4916: \$? = $ac_status" >&5
+  echo "$as_me:4917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4922: \$? = $ac_status" >&5
+  echo "$as_me:4923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -4930,7 +4931,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4933: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:4934: 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"
@@ -4939,13 +4940,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:4942: checking for remove" >&5
+    echo "$as_me:4943: 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 4948 "configure"
+#line 4949 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4976,16 +4977,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4982: \$? = $ac_status" >&5
+  echo "$as_me:4983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4988: \$? = $ac_status" >&5
+  echo "$as_me:4989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -4995,11 +4996,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4998: result: $ac_cv_func_remove" >&5
+echo "$as_me:4999: 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:5002: checking for remove in -lposix" >&5
+      echo "$as_me:5003: 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
@@ -5007,7 +5008,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5010 "configure"
+#line 5011 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5026,16 +5027,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5032: \$? = $ac_status" >&5
+  echo "$as_me:5033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5038: \$? = $ac_status" >&5
+  echo "$as_me:5039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -5046,7 +5047,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5049: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:5050: 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"
@@ -5055,13 +5056,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:5058: checking for shmat" >&5
+    echo "$as_me:5059: 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 5064 "configure"
+#line 5065 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5092,16 +5093,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5098: \$? = $ac_status" >&5
+  echo "$as_me:5099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5104: \$? = $ac_status" >&5
+  echo "$as_me:5105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -5111,11 +5112,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5114: result: $ac_cv_func_shmat" >&5
+echo "$as_me:5115: 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:5118: checking for shmat in -lipc" >&5
+      echo "$as_me:5119: 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
@@ -5123,7 +5124,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5126 "configure"
+#line 5127 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5142,16 +5143,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5148: \$? = $ac_status" >&5
+  echo "$as_me:5149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5154: \$? = $ac_status" >&5
+  echo "$as_me:5155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -5162,7 +5163,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5165: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:5166: 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"
@@ -5180,7 +5181,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:5183: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:5184: 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
@@ -5188,7 +5189,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5191 "configure"
+#line 5192 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5207,16 +5208,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5213: \$? = $ac_status" >&5
+  echo "$as_me:5214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5219: \$? = $ac_status" >&5
+  echo "$as_me:5220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -5227,7 +5228,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5230: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:5231: 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"
@@ -5239,7 +5240,7 @@ fi
 
 fi
 
-echo "$as_me:5242: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:5243: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -5256,17 +5257,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:5259: result: $enable_stdnoreturn" >&5
+echo "$as_me:5260: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:5263: checking for C11 _Noreturn feature" >&5
+echo "$as_me:5264: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5269 "configure"
+#line 5270 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5283,16 +5284,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5286: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5289: \$? = $ac_status" >&5
+  echo "$as_me:5290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5295: \$? = $ac_status" >&5
+  echo "$as_me:5296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -5303,7 +5304,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5306: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:5307: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -5359,16 +5360,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5362: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5363: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5367: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5368: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5371: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5372: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5407,16 +5408,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5410: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5411: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5415: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5416: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5419: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5420: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5455,23 +5456,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5458: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5459: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5463: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5464: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5467: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5468: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:5474: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:5475: 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.
@@ -5488,7 +5489,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:5491: result: $enable_warnings" >&5
+echo "$as_me:5492: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -5511,10 +5512,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:5514: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:5515: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 5517 "${as_me:-configure}"
+#line 5518 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -5563,12 +5564,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:5566: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5569: \$? = $ac_status" >&5
+  echo "$as_me:5570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5571: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:5572: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -5646,7 +5647,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5649 "configure"
+#line 5650 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5661,26 +5662,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5665: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5667: \$? = $ac_status" >&5
+  echo "$as_me:5668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5673: \$? = $ac_status" >&5
+  echo "$as_me:5674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:5676: checking for X11/Xt const-feature" >&5
+echo "$as_me:5677: checking for X11/Xt const-feature" >&5
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5683 "configure"
+#line 5684 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -5697,16 +5698,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5703: \$? = $ac_status" >&5
+  echo "$as_me:5704: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5709: \$? = $ac_status" >&5
+  echo "$as_me:5710: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -5721,7 +5722,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5724: result: $cf_cv_const_x_string" >&5
+echo "$as_me:5725: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -5750,7 +5751,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 5753 "${as_me:-configure}"
+#line 5754 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -5766,7 +5767,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:5769: checking for $CC warning options..." >&5
+	{ echo "$as_me:5770: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -5782,12 +5783,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:5785: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5788: \$? = $ac_status" >&5
+  echo "$as_me:5789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5790: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5791: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -5795,7 +5796,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:5798: checking for $CC warning options..." >&5
+	{ echo "$as_me:5799: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -5818,12 +5819,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:5821: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5824: \$? = $ac_status" >&5
+  echo "$as_me:5825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5826: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5827: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -5831,7 +5832,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:5834: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5835: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5841,7 +5842,7 @@ echo "${as_me:-configure}:5834: testing feature is broken in gcc $GCC_VERSION ..
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:5844: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5845: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5858,7 +5859,7 @@ fi
 
 fi
 
-echo "$as_me:5861: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:5862: 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.
@@ -5880,7 +5881,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:5883: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:5884: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -5994,23 +5995,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:5997: checking for dbmalloc.h" >&5
+	echo "$as_me:5998: 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 6003 "configure"
+#line 6004 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6007: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6008: \"$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:6013: \$? = $ac_status" >&5
+  echo "$as_me:6014: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6029,11 +6030,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6032: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:6033: 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:6036: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:6037: 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
@@ -6041,7 +6042,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6044 "configure"
+#line 6045 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6060,16 +6061,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6066: \$? = $ac_status" >&5
+  echo "$as_me:6067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6072: \$? = $ac_status" >&5
+  echo "$as_me:6073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -6080,7 +6081,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6083: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:6084: 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
@@ -6095,7 +6096,7 @@ fi
 
 fi
 
-echo "$as_me:6098: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:6099: 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.
@@ -6117,7 +6118,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:6120: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:6121: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6231,23 +6232,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:6234: checking for dmalloc.h" >&5
+	echo "$as_me:6235: 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 6240 "configure"
+#line 6241 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6244: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6245: \"$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:6250: \$? = $ac_status" >&5
+  echo "$as_me:6251: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6266,11 +6267,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6269: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:6270: 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:6273: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:6274: 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
@@ -6278,7 +6279,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6281 "configure"
+#line 6282 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6297,16 +6298,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6301: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6303: \$? = $ac_status" >&5
+  echo "$as_me:6304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6309: \$? = $ac_status" >&5
+  echo "$as_me:6310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -6317,7 +6318,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6320: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:6321: 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
@@ -6357,7 +6358,7 @@ case "$host_os" in
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:6360: checking for strcmp in -lc_s" >&5
+echo "$as_me:6361: 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
@@ -6365,7 +6366,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6368 "configure"
+#line 6369 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6384,16 +6385,16 @@ strcmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6390: \$? = $ac_status" >&5
+  echo "$as_me:6391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6396: \$? = $ac_status" >&5
+  echo "$as_me:6397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -6404,7 +6405,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6407: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:6408: 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
@@ -6584,14 +6585,14 @@ fi
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in
 	(cc|*/cc)
-		{ echo "$as_me:6587: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:6588: 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:6594: checking for $ac_word" >&5
+echo "$as_me:6595: 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
@@ -6606,7 +6607,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_prog"
-echo "$as_me:6609: found $ac_dir/$ac_word" >&5
+echo "$as_me:6610: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6614,10 +6615,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:6617: result: $CC" >&5
+  echo "$as_me:6618: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:6620: result: no" >&5
+  echo "$as_me:6621: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6640,23 +6641,23 @@ test -n "$CC" || CC="$CC"
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6643: checking for $ac_header" >&5
+echo "$as_me:6644: 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 6649 "configure"
+#line 6650 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6653: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6654: \"$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:6659: \$? = $ac_status" >&5
+  echo "$as_me:6660: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6675,7 +6676,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6678: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6679: 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
@@ -6703,23 +6704,23 @@ done
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6706: checking for $ac_header" >&5
+echo "$as_me:6707: 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 6712 "configure"
+#line 6713 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6716: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6717: \"$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:6722: \$? = $ac_status" >&5
+  echo "$as_me:6723: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6738,7 +6739,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6741: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6742: 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
@@ -6765,13 +6766,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:6768: checking \$CFLAGS variable" >&5
+echo "$as_me:6769: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:6772: result: broken" >&5
+	echo "$as_me:6773: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6774: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:6775: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
 	cf_flags="$CFLAGS"
 	CFLAGS=
@@ -6879,18 +6880,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:6882: result: ok" >&5
+	echo "$as_me:6883: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:6887: checking \$CC variable" >&5
+echo "$as_me:6888: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:6891: result: broken" >&5
+	echo "$as_me:6892: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6893: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:6894: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
@@ -7007,24 +7008,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:7010: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:7011: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7014: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7015: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7018: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7019: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:7022: result: ok" >&5
+	echo "$as_me:7023: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:7027: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:7028: 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
@@ -7148,7 +7149,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7151 "configure"
+#line 7152 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -7169,16 +7170,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7175: \$? = $ac_status" >&5
+  echo "$as_me:7176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7181: \$? = $ac_status" >&5
+  echo "$as_me:7182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -7191,7 +7192,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:7194: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:7195: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -7305,7 +7306,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:7308: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:7309: 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
@@ -7325,7 +7326,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:7328: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:7329: 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
@@ -7337,7 +7338,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 7340 "configure"
+#line 7341 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7357,16 +7358,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7363: \$? = $ac_status" >&5
+  echo "$as_me:7364: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7369: \$? = $ac_status" >&5
+  echo "$as_me:7370: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7376,16 +7377,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7382: \$? = $ac_status" >&5
+  echo "$as_me:7383: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7388: \$? = $ac_status" >&5
+  echo "$as_me:7389: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -7399,13 +7400,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:7402: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:7403: 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:7408: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:7409: 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
@@ -7413,7 +7414,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7416 "configure"
+#line 7417 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7433,16 +7434,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7437: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7439: \$? = $ac_status" >&5
+  echo "$as_me:7440: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7445: \$? = $ac_status" >&5
+  echo "$as_me:7446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7451,7 +7452,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7454 "configure"
+#line 7455 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -7472,16 +7473,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7478: \$? = $ac_status" >&5
+  echo "$as_me:7479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7484: \$? = $ac_status" >&5
+  echo "$as_me:7485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -7492,7 +7493,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7495: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:7496: 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
 
@@ -7502,7 +7503,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:7505: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:7506: 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
@@ -7510,7 +7511,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7513 "configure"
+#line 7514 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7530,16 +7531,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7534: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7536: \$? = $ac_status" >&5
+  echo "$as_me:7537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7542: \$? = $ac_status" >&5
+  echo "$as_me:7543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7548,7 +7549,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7551 "configure"
+#line 7552 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -7569,16 +7570,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7572: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7575: \$? = $ac_status" >&5
+  echo "$as_me:7576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7581: \$? = $ac_status" >&5
+  echo "$as_me:7582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -7589,7 +7590,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7592: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:7593: 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
 
@@ -7602,7 +7603,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:7605: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:7606: 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
@@ -7610,7 +7611,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7613 "configure"
+#line 7614 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7622,16 +7623,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7628: \$? = $ac_status" >&5
+  echo "$as_me:7629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7634: \$? = $ac_status" >&5
+  echo "$as_me:7635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7640,7 +7641,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7643 "configure"
+#line 7644 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -7653,16 +7654,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7659: \$? = $ac_status" >&5
+  echo "$as_me:7660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7665: \$? = $ac_status" >&5
+  echo "$as_me:7666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -7673,7 +7674,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7676: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:7677: 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
 
@@ -7687,13 +7688,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:7690: checking for fseeko" >&5
+echo "$as_me:7691: 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 7696 "configure"
+#line 7697 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7705,16 +7706,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7711: \$? = $ac_status" >&5
+  echo "$as_me:7712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7717: \$? = $ac_status" >&5
+  echo "$as_me:7718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -7724,7 +7725,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7727: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:7728: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -7763,14 +7764,14 @@ fi
 
 	fi
 
-	echo "$as_me:7766: checking whether to use struct dirent64" >&5
+	echo "$as_me:7767: 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 7773 "configure"
+#line 7774 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -7793,16 +7794,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7796: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7799: \$? = $ac_status" >&5
+  echo "$as_me:7800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7805: \$? = $ac_status" >&5
+  echo "$as_me:7806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -7813,7 +7814,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7816: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:7817: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -7825,20 +7826,20 @@ EOF
 if test -z "$ALL_LINGUAS" ; then
 	ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
-	echo "$as_me:7828: checking for PATH separator" >&5
+	echo "$as_me:7829: 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:7835: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:7836: 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:7841: checking for $ac_word" >&5
+echo "$as_me:7842: 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
@@ -7865,17 +7866,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:7868: result: $MSGINIT" >&5
+  echo "$as_me:7869: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:7871: result: no" >&5
+  echo "$as_me:7872: 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}:7878: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:7879: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -7884,7 +7885,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:7887: checking for $ac_word" >&5
+echo "$as_me:7888: 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
@@ -7899,7 +7900,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:7902: found $ac_dir/$ac_word" >&5
+echo "$as_me:7903: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7907,10 +7908,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:7910: result: $RANLIB" >&5
+  echo "$as_me:7911: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:7913: result: no" >&5
+  echo "$as_me:7914: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7919,7 +7920,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:7922: checking for $ac_word" >&5
+echo "$as_me:7923: 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
@@ -7934,7 +7935,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:7937: found $ac_dir/$ac_word" >&5
+echo "$as_me:7938: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7943,10 +7944,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:7946: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:7947: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:7949: result: no" >&5
+  echo "$as_me:7950: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7955,13 +7956,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:7958: checking for ANSI C header files" >&5
+echo "$as_me:7959: 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 7964 "configure"
+#line 7965 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7969,13 +7970,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7972: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7973: \"$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:7978: \$? = $ac_status" >&5
+  echo "$as_me:7979: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7997,7 +7998,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8000 "configure"
+#line 8001 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -8015,7 +8016,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8018 "configure"
+#line 8019 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -8036,7 +8037,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8039 "configure"
+#line 8040 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -8062,15 +8063,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8068: \$? = $ac_status" >&5
+  echo "$as_me:8069: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8073: \$? = $ac_status" >&5
+  echo "$as_me:8074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8083,7 +8084,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:8086: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8087: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -8093,7 +8094,7 @@ EOF
 
 fi
 
-echo "$as_me:8096: checking for inline" >&5
+echo "$as_me:8097: 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
@@ -8101,7 +8102,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8104 "configure"
+#line 8105 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -8110,16 +8111,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8113: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8116: \$? = $ac_status" >&5
+  echo "$as_me:8117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8122: \$? = $ac_status" >&5
+  echo "$as_me:8123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -8130,7 +8131,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8133: result: $ac_cv_c_inline" >&5
+echo "$as_me:8134: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8151,28 +8152,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8154: checking for $ac_header" >&5
+echo "$as_me:8155: 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 8160 "configure"
+#line 8161 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8166: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8167: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8169: \$? = $ac_status" >&5
+  echo "$as_me:8170: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8175: \$? = $ac_status" >&5
+  echo "$as_me:8176: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -8182,7 +8183,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8186: 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
@@ -8192,13 +8193,13 @@ EOF
 fi
 done
 
-echo "$as_me:8195: checking for off_t" >&5
+echo "$as_me:8196: 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 8201 "configure"
+#line 8202 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8213,16 +8214,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8217: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8219: \$? = $ac_status" >&5
+  echo "$as_me:8220: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8225: \$? = $ac_status" >&5
+  echo "$as_me:8226: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -8232,7 +8233,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8235: result: $ac_cv_type_off_t" >&5
+echo "$as_me:8236: 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
   :
@@ -8244,13 +8245,13 @@ EOF
 
 fi
 
-echo "$as_me:8247: checking for size_t" >&5
+echo "$as_me:8248: 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 8253 "configure"
+#line 8254 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8265,16 +8266,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8271: \$? = $ac_status" >&5
+  echo "$as_me:8272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8277: \$? = $ac_status" >&5
+  echo "$as_me:8278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -8284,7 +8285,7 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8287: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8288: 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
   :
@@ -8298,13 +8299,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:8301: checking for working alloca.h" >&5
+echo "$as_me:8302: 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 8307 "configure"
+#line 8308 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -8316,16 +8317,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8322: \$? = $ac_status" >&5
+  echo "$as_me:8323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8328: \$? = $ac_status" >&5
+  echo "$as_me:8329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -8335,7 +8336,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8338: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:8339: 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
 
@@ -8345,13 +8346,13 @@ EOF
 
 fi
 
-echo "$as_me:8348: checking for alloca" >&5
+echo "$as_me:8349: 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 8354 "configure"
+#line 8355 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -8383,16 +8384,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8389: \$? = $ac_status" >&5
+  echo "$as_me:8390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8395: \$? = $ac_status" >&5
+  echo "$as_me:8396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -8402,7 +8403,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8405: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8406: 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
@@ -8423,13 +8424,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:8426: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8427: 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 8432 "configure"
+#line 8433 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8447,18 +8448,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8450: result: $ac_cv_os_cray" >&5
+echo "$as_me:8451: 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:8455: checking for $ac_func" >&5
+echo "$as_me:8456: 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 8461 "configure"
+#line 8462 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8489,16 +8490,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8493: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8495: \$? = $ac_status" >&5
+  echo "$as_me:8496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8501: \$? = $ac_status" >&5
+  echo "$as_me:8502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8508,7 +8509,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8511: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8512: 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
 
@@ -8522,7 +8523,7 @@ fi
   done
 fi
 
-echo "$as_me:8525: checking stack direction for C alloca" >&5
+echo "$as_me:8526: 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
@@ -8531,7 +8532,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8534 "configure"
+#line 8535 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -8554,15 +8555,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8560: \$? = $ac_status" >&5
+  echo "$as_me:8561: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8565: \$? = $ac_status" >&5
+  echo "$as_me:8566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8574,7 +8575,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8577: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8578: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8586,23 +8587,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8589: checking for $ac_header" >&5
+echo "$as_me:8590: 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 8595 "configure"
+#line 8596 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8599: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8600: \"$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:8605: \$? = $ac_status" >&5
+  echo "$as_me:8606: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8621,7 +8622,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8624: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8625: 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
@@ -8634,13 +8635,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8637: checking for $ac_func" >&5
+echo "$as_me:8638: 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 8643 "configure"
+#line 8644 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8671,16 +8672,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8677: \$? = $ac_status" >&5
+  echo "$as_me:8678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8683: \$? = $ac_status" >&5
+  echo "$as_me:8684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8690,7 +8691,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8693: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8694: 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
@@ -8700,7 +8701,7 @@ EOF
 fi
 done
 
-echo "$as_me:8703: checking for working mmap" >&5
+echo "$as_me:8704: 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
@@ -8709,7 +8710,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8712 "configure"
+#line 8713 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -8836,15 +8837,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8842: \$? = $ac_status" >&5
+  echo "$as_me:8843: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8847: \$? = $ac_status" >&5
+  echo "$as_me:8848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -8856,7 +8857,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8859: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:8860: 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
 
@@ -8867,13 +8868,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:8870: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:8871: 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 8876 "configure"
+#line 8877 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -8893,7 +8894,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8896: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:8897: 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"
@@ -8906,7 +8907,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" &
 : ${CONFIG_H:=config.h}
 
 if test -z "$PACKAGE" ; then
-	{ { echo "$as_me:8909: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:8910: 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
@@ -8923,23 +8924,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8926: checking for $ac_header" >&5
+echo "$as_me:8927: 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 8932 "configure"
+#line 8933 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8936: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8937: \"$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:8942: \$? = $ac_status" >&5
+  echo "$as_me:8943: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8958,7 +8959,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8961: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8962: 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
@@ -8973,13 +8974,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8976: checking for $ac_func" >&5
+echo "$as_me:8977: 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 8982 "configure"
+#line 8983 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9010,16 +9011,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9016: \$? = $ac_status" >&5
+  echo "$as_me:9017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9022: \$? = $ac_status" >&5
+  echo "$as_me:9023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9029,7 +9030,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9032: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:9033: 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
@@ -9080,7 +9081,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9083 "configure"
+#line 9084 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9092,16 +9093,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9098: \$? = $ac_status" >&5
+  echo "$as_me:9099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9104: \$? = $ac_status" >&5
+  echo "$as_me:9105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9118,7 +9119,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9121: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9122: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9164,7 +9165,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9167 "configure"
+#line 9168 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9176,16 +9177,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9182: \$? = $ac_status" >&5
+  echo "$as_me:9183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9188: \$? = $ac_status" >&5
+  echo "$as_me:9189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9202,7 +9203,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9205: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9206: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9220,7 +9221,7 @@ echo "${as_me:-configure}:9205: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:9223: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9224: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9245,7 +9246,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:9248: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9249: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9274,7 +9275,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:9277: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9278: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9283,7 +9284,7 @@ echo "${as_me:-configure}:9277: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:9286: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9287: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9294,7 +9295,7 @@ esac
 
 fi;
 
-  echo "$as_me:9297: checking for iconv" >&5
+  echo "$as_me:9298: 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
@@ -9305,12 +9306,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:9308: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9309: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9313 "configure"
+#line 9314 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9329,16 +9330,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9335: \$? = $ac_status" >&5
+  echo "$as_me:9336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9341: \$? = $ac_status" >&5
+  echo "$as_me:9342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9352,7 +9353,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9355 "configure"
+#line 9356 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9371,16 +9372,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9377: \$? = $ac_status" >&5
+  echo "$as_me:9378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9383: \$? = $ac_status" >&5
+  echo "$as_me:9384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9397,9 +9398,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:9400: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:9401: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:9402: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9403: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9490,7 +9491,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_iconv" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:9493: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9494: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -9498,7 +9499,7 @@ echo "${as_me:-configure}:9493: testing ... testing $cf_cv_header_path_iconv ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9501 "configure"
+#line 9502 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9517,21 +9518,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9523: \$? = $ac_status" >&5
+  echo "$as_me:9524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9529: \$? = $ac_status" >&5
+  echo "$as_me:9530: \$? = $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}:9534: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9535: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9549,7 +9550,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:9552: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9553: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -9624,13 +9625,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_iconv" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me:-configure}:9627: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9628: 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 9633 "configure"
+#line 9634 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9649,21 +9650,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9655: \$? = $ac_status" >&5
+  echo "$as_me:9656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9661: \$? = $ac_status" >&5
+  echo "$as_me:9662: \$? = $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}:9666: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9667: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -9703,7 +9704,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:9706: result: $am_cv_func_iconv" >&5
+echo "$as_me:9707: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -9712,14 +9713,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:9715: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:9716: 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 9722 "configure"
+#line 9723 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9744,16 +9745,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9750: \$? = $ac_status" >&5
+  echo "$as_me:9751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9756: \$? = $ac_status" >&5
+  echo "$as_me:9757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -9763,7 +9764,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:9766: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:9767: 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
@@ -9808,7 +9809,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9811 "configure"
+#line 9812 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9820,16 +9821,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9826: \$? = $ac_status" >&5
+  echo "$as_me:9827: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9832: \$? = $ac_status" >&5
+  echo "$as_me:9833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9846,7 +9847,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:9849: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9850: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9885,7 +9886,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:9888: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9889: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9896,13 +9897,13 @@ fi
     fi
   fi
 
-echo "$as_me:9899: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:9900: 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 9905 "configure"
+#line 9906 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -9914,16 +9915,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9920: \$? = $ac_status" >&5
+  echo "$as_me:9921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9926: \$? = $ac_status" >&5
+  echo "$as_me:9927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -9934,7 +9935,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9937: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:9938: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -9945,13 +9946,13 @@ EOF
 	fi
 
    if test "$ac_cv_header_locale_h" = yes; then
-	echo "$as_me:9948: checking for LC_MESSAGES" >&5
+	echo "$as_me:9949: 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 9954 "configure"
+#line 9955 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -9963,16 +9964,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9969: \$? = $ac_status" >&5
+  echo "$as_me:9970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9975: \$? = $ac_status" >&5
+  echo "$as_me:9976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -9982,7 +9983,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9985: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:9986: 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
 
@@ -9992,7 +9993,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:9995: checking whether NLS is requested" >&5
+   echo "$as_me:9996: 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.
@@ -10002,7 +10003,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:10005: result: $USE_NLS" >&5
+  echo "$as_me:10006: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -10016,7 +10017,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:10019: checking whether included gettext is requested" >&5
+    echo "$as_me:10020: 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.
@@ -10026,13 +10027,13 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:10029: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:10030: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
         # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:10035: checking for $ac_word" >&5
+echo "$as_me:10036: 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
@@ -10059,16 +10060,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:10062: result: $MSGFMT" >&5
+  echo "$as_me:10063: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:10065: result: no" >&5
+  echo "$as_me:10066: 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:10071: checking for $ac_word" >&5
+echo "$as_me:10072: 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
@@ -10085,7 +10086,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:10088: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10089: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10097,17 +10098,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:10100: result: $GMSGFMT" >&5
+  echo "$as_me:10101: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:10103: result: no" >&5
+  echo "$as_me:10104: 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:10110: checking for $ac_word" >&5
+echo "$as_me:10111: 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
@@ -10134,10 +10135,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:10137: result: $XGETTEXT" >&5
+  echo "$as_me:10138: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:10140: result: no" >&5
+  echo "$as_me:10141: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10275,12 +10276,12 @@ fi
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:10278: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10279: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10283 "configure"
+#line 10284 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10302,16 +10303,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10308: \$? = $ac_status" >&5
+  echo "$as_me:10309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10314: \$? = $ac_status" >&5
+  echo "$as_me:10315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10325,7 +10326,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10328 "configure"
+#line 10329 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10347,16 +10348,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10353: \$? = $ac_status" >&5
+  echo "$as_me:10354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10359: \$? = $ac_status" >&5
+  echo "$as_me:10360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10373,9 +10374,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:10376: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:10377: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:10378: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10379: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10466,7 +10467,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_intl" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me:-configure}:10469: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10470: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -10474,7 +10475,7 @@ echo "${as_me:-configure}:10469: testing ... testing $cf_cv_header_path_intl ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10477 "configure"
+#line 10478 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10496,21 +10497,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10502: \$? = $ac_status" >&5
+  echo "$as_me:10503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10508: \$? = $ac_status" >&5
+  echo "$as_me:10509: \$? = $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}:10513: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10514: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10528,7 +10529,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:10531: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10532: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -10603,13 +10604,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_intl" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me:-configure}:10606: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10607: 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 10612 "configure"
+#line 10613 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10631,21 +10632,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10637: \$? = $ac_status" >&5
+  echo "$as_me:10638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10643: \$? = $ac_status" >&5
+  echo "$as_me:10644: \$? = $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}:10648: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10649: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -10684,9 +10685,9 @@ else
 cf_cv_func_gettext=no
 fi
 
-      echo "$as_me:10687: checking for libintl.h and gettext()" >&5
+      echo "$as_me:10688: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
-      echo "$as_me:10689: result: $cf_cv_func_gettext" >&5
+      echo "$as_me:10690: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       LIBS="$cf_save_LIBS_1"
@@ -10731,7 +10732,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10734 "configure"
+#line 10735 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10743,16 +10744,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10749: \$? = $ac_status" >&5
+  echo "$as_me:10750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10755: \$? = $ac_status" >&5
+  echo "$as_me:10756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10769,7 +10770,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:10772: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10773: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10808,7 +10809,7 @@ if test -n "$cf_cv_library_path_intl" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:10811: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10812: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -10824,13 +10825,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10827: checking for $ac_func" >&5
+echo "$as_me:10828: 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 10833 "configure"
+#line 10834 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10861,16 +10862,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10867: \$? = $ac_status" >&5
+  echo "$as_me:10868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10873: \$? = $ac_status" >&5
+  echo "$as_me:10874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10880,7 +10881,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10883: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10884: 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
@@ -10895,7 +10896,7 @@ done
           CATOBJEXT=.gmo
         fi
       elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
-        { echo "$as_me:10898: WARNING: disabling NLS feature" >&5
+        { echo "$as_me:10899: WARNING: disabling NLS feature" >&5
 echo "$as_me: WARNING: disabling NLS feature" >&2;}
         sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp
         mv confdefs.tmp confdefs.h
@@ -10931,7 +10932,7 @@ EOF
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       elif test "$nls_cv_use_gnu_gettext" = "yes"; then
         nls_cv_use_gnu_gettext=no
-        { echo "$as_me:10934: WARNING: no NLS library is packaged with this application" >&5
+        { echo "$as_me:10935: WARNING: no NLS library is packaged with this application" >&5
 echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;}
       fi
     fi
@@ -10940,7 +10941,7 @@ echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;}
       if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        { echo "$as_me:10943: WARNING: found msgfmt program is not GNU msgfmt" >&5
+        { echo "$as_me:10944: WARNING: found msgfmt program is not GNU msgfmt" >&5
 echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       fi
     fi
@@ -10949,7 +10950,7 @@ echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        { echo "$as_me:10952: WARNING: found xgettext program is not GNU xgettext" >&5
+        { echo "$as_me:10953: WARNING: found xgettext program is not GNU xgettext" >&5
 echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
       fi
     fi
@@ -10967,7 +10968,7 @@ echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
 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:10970: checking for $ac_word" >&5
+echo "$as_me:10971: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTL_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10982,7 +10983,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTL_YACC="$ac_prog"
-echo "$as_me:10985: found $ac_dir/$ac_word" >&5
+echo "$as_me:10986: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10990,10 +10991,10 @@ fi
 fi
 INTL_YACC=$ac_cv_prog_INTL_YACC
 if test -n "$INTL_YACC"; then
-  echo "$as_me:10993: result: $INTL_YACC" >&5
+  echo "$as_me:10994: result: $INTL_YACC" >&5
 echo "${ECHO_T}$INTL_YACC" >&6
 else
-  echo "$as_me:10996: result: no" >&5
+  echo "$as_me:10997: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11003,7 +11004,7 @@ done
       if test -z "$INTL_YACC"; then
         ac_verc_fail=yes
       else
-                echo "$as_me:11006: checking version of $INTL_YACC" >&5
+                echo "$as_me:11007: checking version of $INTL_YACC" >&5
 echo $ECHO_N "checking version of $INTL_YACC... $ECHO_C" >&6
         ac_prog_version=`$INTL_YACC -V 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p;s/^\(byacc\) - \([0-9][0-9.]*\) \([0-9]*\).*$/\1-\2.\3/p'`
         case "$ac_prog_version" in
@@ -11014,7 +11015,7 @@ echo $ECHO_N "checking version of $INTL_YACC... $ECHO_C" >&6
              ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
           (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
         esac
-      echo "$as_me:11017: result: $ac_prog_version" >&5
+      echo "$as_me:11018: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
       fi
       if test "$ac_verc_fail" = yes; then
@@ -11041,7 +11042,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:11044: checking for catalogs to be installed" >&5
+       echo "$as_me:11045: 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
@@ -11061,7 +11062,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:11064: result: $LINGUAS" >&5
+       echo "$as_me:11065: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -11097,7 +11098,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d "$srcdir/po" ; then
-echo "$as_me:11100: checking if we should use included message-library" >&5
+echo "$as_me:11101: 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.
@@ -11108,7 +11109,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:11111: result: $use_our_messages" >&5
+echo "$as_me:11112: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -11150,23 +11151,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11153: checking for $ac_header" >&5
+echo "$as_me:11154: 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 11159 "configure"
+#line 11160 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11163: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11164: \"$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:11169: \$? = $ac_status" >&5
+  echo "$as_me:11170: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11185,7 +11186,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11188: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11189: 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
@@ -11274,7 +11275,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:11277: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:11278: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11283,7 +11284,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:11286: checking if you want full utility pathnames" >&5
+echo "$as_me:11287: 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.
@@ -11300,14 +11301,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:11303: result: $with_full_paths" >&5
+echo "$as_me:11304: 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:11310: checking for system mailer" >&5
+echo "$as_me:11311: 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
@@ -11327,14 +11328,14 @@ else
 
 fi
 
-echo "$as_me:11330: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:11331: 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:11337: checking system mail flags" >&5
+echo "$as_me:11338: 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
@@ -11350,7 +11351,7 @@ else
 
 fi
 
-echo "$as_me:11353: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:11354: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -11363,14 +11364,14 @@ if test "$with_full_paths" = no ; then
 fi
 fi
 
-echo "$as_me:11366: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:11367: checking if the POSIX test-macros are already defined" >&5
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11373 "configure"
+#line 11374 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11389,16 +11390,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11393: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11395: \$? = $ac_status" >&5
+  echo "$as_me:11396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11401: \$? = $ac_status" >&5
+  echo "$as_me:11402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -11409,7 +11410,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11412: result: $cf_cv_posix_visible" >&5
+echo "$as_me:11413: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -11454,14 +11455,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:11457: checking if this is the GNU C library" >&5
+echo "$as_me:11458: checking if this is the GNU C library" >&5
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11464 "configure"
+#line 11465 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11480,16 +11481,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11486: \$? = $ac_status" >&5
+  echo "$as_me:11487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11492: \$? = $ac_status" >&5
+  echo "$as_me:11493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -11500,7 +11501,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11503: result: $cf_cv_gnu_library" >&5
+echo "$as_me:11504: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -11508,7 +11509,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
 	# was changed to help a little.  newlib incorporated the change about 4
 	# years later.
-	echo "$as_me:11511: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:11512: checking if _DEFAULT_SOURCE can be used as a basis" >&5
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11520,7 +11521,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11523 "configure"
+#line 11524 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11539,16 +11540,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11545: \$? = $ac_status" >&5
+  echo "$as_me:11546: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11551: \$? = $ac_status" >&5
+  echo "$as_me:11552: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -11560,12 +11561,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:11563: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:11564: result: $cf_cv_gnu_library_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
 	if test "x$cf_cv_gnu_library_219" = xyes; then
 		cf_save="$CPPFLAGS"
-		echo "$as_me:11568: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:11569: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11670,7 +11671,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11673 "configure"
+#line 11674 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -11690,16 +11691,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11696: \$? = $ac_status" >&5
+  echo "$as_me:11697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11702: \$? = $ac_status" >&5
+  echo "$as_me:11703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11710,7 +11711,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11713: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11714: result: $cf_cv_gnu_dftsrc_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
 	else
@@ -11719,14 +11720,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11722: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11723: 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 11729 "configure"
+#line 11730 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11741,16 +11742,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11747: \$? = $ac_status" >&5
+  echo "$as_me:11748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11753: \$? = $ac_status" >&5
+  echo "$as_me:11754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11857,7 +11858,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11860 "configure"
+#line 11861 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11872,16 +11873,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11876: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11878: \$? = $ac_status" >&5
+  echo "$as_me:11879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11884: \$? = $ac_status" >&5
+  echo "$as_me:11885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11896,12 +11897,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11899: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11900: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
 		if test "$cf_cv_gnu_source" = yes
 		then
-		echo "$as_me:11904: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11905: checking if we should also define _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11911,7 +11912,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11914 "configure"
+#line 11915 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11926,16 +11927,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11932: \$? = $ac_status" >&5
+  echo "$as_me:11933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11938: \$? = $ac_status" >&5
+  echo "$as_me:11939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11946,7 +11947,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11949: result: $cf_cv_default_source" >&5
+echo "$as_me:11950: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11983,16 +11984,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11986: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11987: 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}:11992: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11993: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11995 "configure"
+#line 11996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12007,16 +12008,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12013: \$? = $ac_status" >&5
+  echo "$as_me:12014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12019: \$? = $ac_status" >&5
+  echo "$as_me:12020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12037,7 +12038,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12040 "configure"
+#line 12041 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12052,16 +12053,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12058: \$? = $ac_status" >&5
+  echo "$as_me:12059: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12064: \$? = $ac_status" >&5
+  echo "$as_me:12065: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12072,7 +12073,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12075: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12076: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12080,10 +12081,10 @@ echo "${as_me:-configure}:12075: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12083: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12084: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12086 "configure"
+#line 12087 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12098,16 +12099,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12102: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12104: \$? = $ac_status" >&5
+  echo "$as_me:12105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12110: \$? = $ac_status" >&5
+  echo "$as_me:12111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12123,7 +12124,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12126: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12127: 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
@@ -12240,7 +12241,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:12243: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:12244: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -12272,14 +12273,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:12275: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12276: 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 12282 "configure"
+#line 12283 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12298,16 +12299,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12304: \$? = $ac_status" >&5
+  echo "$as_me:12305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12310: \$? = $ac_status" >&5
+  echo "$as_me:12311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12319,7 +12320,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12322 "configure"
+#line 12323 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12338,16 +12339,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12344: \$? = $ac_status" >&5
+  echo "$as_me:12345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12350: \$? = $ac_status" >&5
+  echo "$as_me:12351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12362,7 +12363,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12365: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12366: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12520,16 +12521,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:12523: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12524: 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}:12529: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12530: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12532 "configure"
+#line 12533 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12544,16 +12545,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12550: \$? = $ac_status" >&5
+  echo "$as_me:12551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12556: \$? = $ac_status" >&5
+  echo "$as_me:12557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12574,7 +12575,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12577 "configure"
+#line 12578 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12589,16 +12590,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12593: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12595: \$? = $ac_status" >&5
+  echo "$as_me:12596: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12601: \$? = $ac_status" >&5
+  echo "$as_me:12602: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12609,7 +12610,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12612: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12613: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12617,10 +12618,10 @@ echo "${as_me:-configure}:12612: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12620: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12621: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12623 "configure"
+#line 12624 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12635,16 +12636,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12641: \$? = $ac_status" >&5
+  echo "$as_me:12642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12647: \$? = $ac_status" >&5
+  echo "$as_me:12648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12660,7 +12661,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12663: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12664: 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
@@ -12786,7 +12787,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12789: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12790: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12798,7 +12799,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12801: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12802: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12886,7 +12887,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12889: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12890: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12896,7 +12897,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12899: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12900: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12906,7 +12907,7 @@ 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}:12909: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12910: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -12918,10 +12919,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12921: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12922: 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 12924 "configure"
+#line 12925 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12936,16 +12937,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12940: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12942: \$? = $ac_status" >&5
+  echo "$as_me:12943: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12948: \$? = $ac_status" >&5
+  echo "$as_me:12949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12954,12 +12955,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12957: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12958: 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 12962 "configure"
+#line 12963 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12974,16 +12975,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12980: \$? = $ac_status" >&5
+  echo "$as_me:12981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12986: \$? = $ac_status" >&5
+  echo "$as_me:12987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12994,19 +12995,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12997: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12998: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:13002: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13003: 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 13009 "configure"
+#line 13010 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13025,16 +13026,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13031: \$? = $ac_status" >&5
+  echo "$as_me:13032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13037: \$? = $ac_status" >&5
+  echo "$as_me:13038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13046,7 +13047,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13049 "configure"
+#line 13050 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13065,16 +13066,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13071: \$? = $ac_status" >&5
+  echo "$as_me:13072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13077: \$? = $ac_status" >&5
+  echo "$as_me:13078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13089,7 +13090,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13092: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13093: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13236,14 +13237,14 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:13239: checking if SIGWINCH is defined" >&5
+echo "$as_me:13240: 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 13246 "configure"
+#line 13247 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13258,23 +13259,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13264: \$? = $ac_status" >&5
+  echo "$as_me:13265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13270: \$? = $ac_status" >&5
+  echo "$as_me:13271: \$? = $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 13277 "configure"
+#line 13278 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13292,16 +13293,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13298: \$? = $ac_status" >&5
+  echo "$as_me:13299: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13304: \$? = $ac_status" >&5
+  echo "$as_me:13305: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -13315,11 +13316,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13318: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:13319: 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:13322: checking for actual SIGWINCH definition" >&5
+echo "$as_me:13323: 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
@@ -13330,7 +13331,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13333 "configure"
+#line 13334 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13352,16 +13353,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13358: \$? = $ac_status" >&5
+  echo "$as_me:13359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13364: \$? = $ac_status" >&5
+  echo "$as_me:13365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -13375,7 +13376,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:13378: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:13379: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -13387,7 +13388,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13390: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13391: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -13472,7 +13473,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:13475: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13476: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -13482,7 +13483,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:13485: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13486: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -13492,7 +13493,7 @@ 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}:13495: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13496: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -13501,7 +13502,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13504 "configure"
+#line 13505 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13513,16 +13514,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13516: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13519: \$? = $ac_status" >&5
+  echo "$as_me:13520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13525: \$? = $ac_status" >&5
+  echo "$as_me:13526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13530,12 +13531,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13533: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13534: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:13538: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:13539: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -13547,7 +13548,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:13550: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:13551: 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
@@ -13562,10 +13563,10 @@ else
 fi;
 
 fi
-echo "$as_me:13565: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:13566: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:13568: checking if you want ssl library" >&5
+echo "$as_me:13569: 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
@@ -13580,10 +13581,10 @@ else
 fi;
 
 fi
-echo "$as_me:13583: result: $cf_cv_use_libssl" >&5
+echo "$as_me:13584: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:13586: checking if you want gnutls support" >&5
+echo "$as_me:13587: 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
@@ -13598,11 +13599,11 @@ else
 fi;
 
 fi
-echo "$as_me:13601: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:13602: 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:13605: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:13606: 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
@@ -13617,10 +13618,10 @@ else
 fi;
 
 fi
-echo "$as_me:13620: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:13621: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:13623: checking if you want socks library" >&5
+echo "$as_me:13624: 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
@@ -13635,10 +13636,10 @@ else
 fi;
 
 fi
-echo "$as_me:13638: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:13639: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:13641: checking if you want socks5 library" >&5
+echo "$as_me:13642: 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
@@ -13653,7 +13654,7 @@ else
 fi;
 
 fi
-echo "$as_me:13656: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:13657: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -13695,7 +13696,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13698 "configure"
+#line 13699 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13707,16 +13708,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13713: \$? = $ac_status" >&5
+  echo "$as_me:13714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13719: \$? = $ac_status" >&5
+  echo "$as_me:13720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13733,7 +13734,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13736: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13737: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13779,7 +13780,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13782 "configure"
+#line 13783 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13791,16 +13792,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13797: \$? = $ac_status" >&5
+  echo "$as_me:13798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13803: \$? = $ac_status" >&5
+  echo "$as_me:13804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13817,7 +13818,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13820: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13821: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13835,7 +13836,7 @@ echo "${as_me:-configure}:13820: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13838: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:13839: 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
@@ -13860,7 +13861,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13863: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13864: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13889,7 +13890,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13892: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13893: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13898,7 +13899,7 @@ echo "${as_me:-configure}:13892: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13901: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:13902: 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
@@ -13912,12 +13913,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:13915: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:13916: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13920 "configure"
+#line 13921 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13933,16 +13934,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13939: \$? = $ac_status" >&5
+  echo "$as_me:13940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13945: \$? = $ac_status" >&5
+  echo "$as_me:13946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -13956,7 +13957,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13959 "configure"
+#line 13960 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13972,16 +13973,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13978: \$? = $ac_status" >&5
+  echo "$as_me:13979: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13984: \$? = $ac_status" >&5
+  echo "$as_me:13985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -13998,9 +13999,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:14001: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:14002: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:14003: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14004: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14091,7 +14092,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_socks" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me:-configure}:14094: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14095: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -14099,7 +14100,7 @@ echo "${as_me:-configure}:14094: testing ... testing $cf_cv_header_path_socks ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 14102 "configure"
+#line 14103 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14115,21 +14116,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14121: \$? = $ac_status" >&5
+  echo "$as_me:14122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14127: \$? = $ac_status" >&5
+  echo "$as_me:14128: \$? = $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}:14132: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14133: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14147,7 +14148,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:14150: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14151: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14222,13 +14223,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_socks" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me:-configure}:14225: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14226: 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 14231 "configure"
+#line 14232 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14244,21 +14245,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14248: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14250: \$? = $ac_status" >&5
+  echo "$as_me:14251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14256: \$? = $ac_status" >&5
+  echo "$as_me:14257: \$? = $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}:14261: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14262: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -14320,7 +14321,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14323 "configure"
+#line 14324 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14332,16 +14333,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14338: \$? = $ac_status" >&5
+  echo "$as_me:14339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14344: \$? = $ac_status" >&5
+  echo "$as_me:14345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14358,7 +14359,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14361: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14362: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14394,7 +14395,7 @@ if test -n "$cf_cv_library_path_socks" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14397: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14398: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14419,7 +14420,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:14422: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:14423: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -14462,7 +14463,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:14465: error: cannot link with socks library" >&5
+    { { echo "$as_me:14466: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -14506,7 +14507,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14509 "configure"
+#line 14510 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14518,16 +14519,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14524: \$? = $ac_status" >&5
+  echo "$as_me:14525: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14530: \$? = $ac_status" >&5
+  echo "$as_me:14531: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14544,7 +14545,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14547: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14548: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14590,7 +14591,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14593 "configure"
+#line 14594 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14602,16 +14603,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14608: \$? = $ac_status" >&5
+  echo "$as_me:14609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14614: \$? = $ac_status" >&5
+  echo "$as_me:14615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14628,7 +14629,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14631: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14632: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14646,7 +14647,7 @@ echo "${as_me:-configure}:14631: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14649: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14650: 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
@@ -14671,7 +14672,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14674: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14675: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14700,7 +14701,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14703: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14704: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14709,7 +14710,7 @@ echo "${as_me:-configure}:14703: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14712: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14713: 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
@@ -14742,11 +14743,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:14745: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:14746: 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 14749 "configure"
+#line 14750 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -14760,16 +14761,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14766: \$? = $ac_status" >&5
+  echo "$as_me:14767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14772: \$? = $ac_status" >&5
+  echo "$as_me:14773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -14781,7 +14782,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14784 "configure"
+#line 14785 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -14793,29 +14794,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14799: \$? = $ac_status" >&5
+  echo "$as_me:14800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14805: \$? = $ac_status" >&5
+  echo "$as_me:14806: \$? = $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:14811: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:14812: 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:14818: result: $cf_use_socks4" >&5
+echo "$as_me:14819: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -14870,10 +14871,10 @@ EOF
 
 fi
 
-echo "$as_me:14873: checking if socks5p.h is available" >&5
+echo "$as_me:14874: 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 14876 "configure"
+#line 14877 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -14888,16 +14889,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14894: \$? = $ac_status" >&5
+  echo "$as_me:14895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14900: \$? = $ac_status" >&5
+  echo "$as_me:14901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -14906,7 +14907,7 @@ cat "conftest.$ac_ext" >&5
 cf_use_socks5p_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:14909: result: $cf_use_socks5p_h" >&5
+echo "$as_me:14910: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -14918,14 +14919,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:14921: checking for network libraries" >&5
+echo "$as_me:14922: 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:14928: result: working..." >&5
+echo "$as_me:14929: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -14937,23 +14938,23 @@ case "$host_os" in
 for ac_header in windows.h winsock.h winsock2.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14940: checking for $ac_header" >&5
+echo "$as_me:14941: 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 14946 "configure"
+#line 14947 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14950: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14951: \"$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:14956: \$? = $ac_status" >&5
+  echo "$as_me:14957: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14972,7 +14973,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:14975: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14976: 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
@@ -15007,7 +15008,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15010 "configure"
+#line 15011 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -15034,22 +15035,22 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15040: \$? = $ac_status" >&5
+  echo "$as_me:15041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15046: \$? = $ac_status" >&5
+  echo "$as_me:15047: \$? = $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:15052: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:15053: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15062,13 +15063,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15065: checking for $ac_func" >&5
+echo "$as_me:15066: 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 15071 "configure"
+#line 15072 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15099,16 +15100,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15105: \$? = $ac_status" >&5
+  echo "$as_me:15106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15111: \$? = $ac_status" >&5
+  echo "$as_me:15112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15118,7 +15119,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15121: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15122: 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
@@ -15127,7 +15128,7 @@ EOF
 
 else
 
-echo "$as_me:15130: checking for gethostname in -lnsl" >&5
+echo "$as_me:15131: 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
@@ -15135,7 +15136,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15138 "configure"
+#line 15139 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15154,16 +15155,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15160: \$? = $ac_status" >&5
+  echo "$as_me:15161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15166: \$? = $ac_status" >&5
+  echo "$as_me:15167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -15174,7 +15175,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15177: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:15178: 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
 
@@ -15191,7 +15192,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:15194: checking for gethostname in -lsocket" >&5
+echo "$as_me:15195: 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
@@ -15199,7 +15200,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15202 "configure"
+#line 15203 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15218,16 +15219,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15222: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15224: \$? = $ac_status" >&5
+  echo "$as_me:15225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15230: \$? = $ac_status" >&5
+  echo "$as_me:15231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -15238,7 +15239,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15241: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:15242: 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
 
@@ -15262,7 +15263,7 @@ fi
 fi
 done
 
-	echo "$as_me:15265: checking for main in -linet" >&5
+	echo "$as_me:15266: 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
@@ -15270,7 +15271,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15273 "configure"
+#line 15274 "configure"
 #include "confdefs.h"
 
 int
@@ -15282,16 +15283,16 @@ main ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15288: \$? = $ac_status" >&5
+  echo "$as_me:15289: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15294: \$? = $ac_status" >&5
+  echo "$as_me:15295: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -15302,7 +15303,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15305: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:15306: 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"
@@ -15313,13 +15314,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15316: checking for $ac_func" >&5
+echo "$as_me:15317: 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 15322 "configure"
+#line 15323 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15350,16 +15351,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15356: \$? = $ac_status" >&5
+  echo "$as_me:15357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15362: \$? = $ac_status" >&5
+  echo "$as_me:15363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15369,7 +15370,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15372: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15373: 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
@@ -15378,7 +15379,7 @@ EOF
 
 else
 
-echo "$as_me:15381: checking for socket in -lsocket" >&5
+echo "$as_me:15382: 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
@@ -15386,7 +15387,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15389 "configure"
+#line 15390 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15405,16 +15406,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15411: \$? = $ac_status" >&5
+  echo "$as_me:15412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15417: \$? = $ac_status" >&5
+  echo "$as_me:15418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -15425,7 +15426,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15428: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:15429: 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
 
@@ -15442,7 +15443,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:15445: checking for socket in -lbsd" >&5
+echo "$as_me:15446: 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
@@ -15450,7 +15451,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15453 "configure"
+#line 15454 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15469,16 +15470,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15475: \$? = $ac_status" >&5
+  echo "$as_me:15476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15481: \$? = $ac_status" >&5
+  echo "$as_me:15482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -15489,7 +15490,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15492: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:15493: 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
 
@@ -15518,13 +15519,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15521: checking for $ac_func" >&5
+echo "$as_me:15522: 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 15527 "configure"
+#line 15528 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15555,16 +15556,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15561: \$? = $ac_status" >&5
+  echo "$as_me:15562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15567: \$? = $ac_status" >&5
+  echo "$as_me:15568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15574,7 +15575,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15577: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15578: 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
@@ -15583,7 +15584,7 @@ EOF
 
 else
 
-echo "$as_me:15586: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:15587: 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
@@ -15591,7 +15592,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15594 "configure"
+#line 15595 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15610,16 +15611,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15616: \$? = $ac_status" >&5
+  echo "$as_me:15617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15622: \$? = $ac_status" >&5
+  echo "$as_me:15623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -15630,7 +15631,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15633: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:15634: 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
 
@@ -15655,13 +15656,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15658: checking for $ac_func" >&5
+echo "$as_me:15659: 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 15664 "configure"
+#line 15665 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15692,16 +15693,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15698: \$? = $ac_status" >&5
+  echo "$as_me:15699: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15704: \$? = $ac_status" >&5
+  echo "$as_me:15705: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15711,7 +15712,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15714: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15715: 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
@@ -15720,7 +15721,7 @@ EOF
 
 else
 
-echo "$as_me:15723: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:15724: 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
@@ -15728,7 +15729,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15731 "configure"
+#line 15732 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15747,16 +15748,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15753: \$? = $ac_status" >&5
+  echo "$as_me:15754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15759: \$? = $ac_status" >&5
+  echo "$as_me:15760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -15767,7 +15768,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15770: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:15771: 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
 
@@ -15792,13 +15793,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15795: checking for $ac_func" >&5
+echo "$as_me:15796: 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 15801 "configure"
+#line 15802 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15829,16 +15830,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15833: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15835: \$? = $ac_status" >&5
+  echo "$as_me:15836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15841: \$? = $ac_status" >&5
+  echo "$as_me:15842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15848,7 +15849,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15851: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15852: 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
@@ -15857,7 +15858,7 @@ EOF
 
 else
 
-echo "$as_me:15860: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:15861: 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
@@ -15865,7 +15866,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15868 "configure"
+#line 15869 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15884,16 +15885,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15888: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15890: \$? = $ac_status" >&5
+  echo "$as_me:15891: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15896: \$? = $ac_status" >&5
+  echo "$as_me:15897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -15904,7 +15905,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15907: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:15908: 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
 
@@ -15929,13 +15930,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15932: checking for $ac_func" >&5
+echo "$as_me:15933: 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 15938 "configure"
+#line 15939 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15966,16 +15967,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15972: \$? = $ac_status" >&5
+  echo "$as_me:15973: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15978: \$? = $ac_status" >&5
+  echo "$as_me:15979: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15985,7 +15986,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15988: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15989: 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
@@ -15994,7 +15995,7 @@ EOF
 
 else
 
-echo "$as_me:15997: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:15998: 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
@@ -16002,7 +16003,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16005 "configure"
+#line 16006 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16021,16 +16022,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16027: \$? = $ac_status" >&5
+  echo "$as_me:16028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16033: \$? = $ac_status" >&5
+  echo "$as_me:16034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -16041,7 +16042,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16044: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:16045: 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
 
@@ -16098,14 +16099,14 @@ test "$cf_test_netlibs" = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:16101: checking for inet_aton function" >&5
+echo "$as_me:16102: 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 16108 "configure"
+#line 16109 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -16140,16 +16141,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16146: \$? = $ac_status" >&5
+  echo "$as_me:16147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16152: \$? = $ac_status" >&5
+  echo "$as_me:16153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -16159,7 +16160,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16162: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:16163: 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
 
@@ -16168,14 +16169,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:16171: checking for inet_addr function" >&5
+    echo "$as_me:16172: 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 16178 "configure"
+#line 16179 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -16210,16 +16211,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16216: \$? = $ac_status" >&5
+  echo "$as_me:16217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16222: \$? = $ac_status" >&5
+  echo "$as_me:16223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -16229,10 +16230,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16232: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:16233: 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:16235: checking for library with inet_addr" >&5
+	echo "$as_me:16236: 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
@@ -16243,7 +16244,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16246 "configure"
+#line 16247 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -16259,16 +16260,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16265: \$? = $ac_status" >&5
+  echo "$as_me:16266: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16271: \$? = $ac_status" >&5
+  echo "$as_me:16272: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -16282,7 +16283,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    done
 
 fi
-echo "$as_me:16285: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:16286: 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
 
@@ -16303,13 +16304,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:16306: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:16307: 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:16312: checking if you want to use pkg-config" >&5
+echo "$as_me:16313: 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.
@@ -16319,7 +16320,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:16322: result: $cf_pkg_config" >&5
+echo "$as_me:16323: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -16331,7 +16332,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:16334: checking for $ac_word" >&5
+echo "$as_me:16335: 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
@@ -16348,7 +16349,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:16351: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16352: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16359,10 +16360,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:16362: result: $PKG_CONFIG" >&5
+  echo "$as_me:16363: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:16365: result: no" >&5
+  echo "$as_me:16366: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16371,7 +16372,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:16374: checking for $ac_word" >&5
+echo "$as_me:16375: 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
@@ -16388,7 +16389,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:16391: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16392: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16400,10 +16401,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:16403: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:16404: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:16406: result: no" >&5
+  echo "$as_me:16407: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16446,14 +16447,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:16449: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:16450: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
-	{ echo "$as_me:16456: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:16457: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -16501,7 +16502,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16504 "configure"
+#line 16505 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16513,16 +16514,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16517: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16519: \$? = $ac_status" >&5
+  echo "$as_me:16520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16525: \$? = $ac_status" >&5
+  echo "$as_me:16526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16539,7 +16540,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16542: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16543: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16585,7 +16586,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16588 "configure"
+#line 16589 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16597,16 +16598,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16603: \$? = $ac_status" >&5
+  echo "$as_me:16604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16609: \$? = $ac_status" >&5
+  echo "$as_me:16610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16623,7 +16624,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16626: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16627: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16641,7 +16642,7 @@ echo "${as_me:-configure}:16626: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16644: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16645: 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
@@ -16666,7 +16667,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16669: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16670: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16695,7 +16696,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16698: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16699: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16704,7 +16705,7 @@ echo "${as_me:-configure}:16698: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16707: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16708: 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
@@ -16721,15 +16722,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:16724: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:16725: 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:16728: result: yes" >&5
+					echo "$as_me:16729: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:16732: result: no" >&5
+					echo "$as_me:16733: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -16873,7 +16874,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16876: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16877: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -16909,7 +16910,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:16912: checking for dlsym in -ldl" >&5
+				echo "$as_me:16913: 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
@@ -16917,7 +16918,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16920 "configure"
+#line 16921 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16936,16 +16937,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16942: \$? = $ac_status" >&5
+  echo "$as_me:16943: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16948: \$? = $ac_status" >&5
+  echo "$as_me:16949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -16956,7 +16957,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16959: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:16960: 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"
@@ -16972,12 +16973,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:16975: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:16976: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16980 "configure"
+#line 16981 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17006,16 +17007,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17012: \$? = $ac_status" >&5
+  echo "$as_me:17013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17018: \$? = $ac_status" >&5
+  echo "$as_me:17019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17029,7 +17030,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17032 "configure"
+#line 17033 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17058,16 +17059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17064: \$? = $ac_status" >&5
+  echo "$as_me:17065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17070: \$? = $ac_status" >&5
+  echo "$as_me:17071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17084,9 +17085,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:17087: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:17088: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:17089: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17090: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17177,7 +17178,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_ssl" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:17180: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17181: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -17185,7 +17186,7 @@ echo "${as_me:-configure}:17180: testing ... testing $cf_cv_header_path_ssl ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_ssl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 17188 "configure"
+#line 17189 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17214,21 +17215,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17220: \$? = $ac_status" >&5
+  echo "$as_me:17221: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17226: \$? = $ac_status" >&5
+  echo "$as_me:17227: \$? = $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}:17231: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17232: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17246,7 +17247,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:17249: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17250: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -17254,7 +17255,7 @@ echo "${as_me:-configure}:17249: testing Searching for ssl library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17257 "configure"
+#line 17258 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17283,21 +17284,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17289: \$? = $ac_status" >&5
+  echo "$as_me:17290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17295: \$? = $ac_status" >&5
+  echo "$as_me:17296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:17300: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:17301: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -17378,13 +17379,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_ssl" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me:-configure}:17381: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17382: 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 17387 "configure"
+#line 17388 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17413,21 +17414,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17419: \$? = $ac_status" >&5
+  echo "$as_me:17420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17425: \$? = $ac_status" >&5
+  echo "$as_me:17426: \$? = $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}:17430: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17431: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -17489,7 +17490,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:17492: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17493: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17548,7 +17549,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17551 "configure"
+#line 17552 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17560,16 +17561,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17566: \$? = $ac_status" >&5
+  echo "$as_me:17567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17572: \$? = $ac_status" >&5
+  echo "$as_me:17573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17586,7 +17587,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:17589: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17590: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17619,7 +17620,7 @@ EOF
 		if test -n "$cf_cv_header_path_ssl" ; then
 			test -n "$verbose" && echo "	checking ssl header-path $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:17622: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17623: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case "$cf_cv_header_path_ssl" in
 			(*/openssl)
@@ -17632,10 +17633,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:17635: checking for X509 support" >&5
+echo "$as_me:17636: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17638 "configure"
+#line 17639 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17664,16 +17665,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17670: \$? = $ac_status" >&5
+  echo "$as_me:17671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17676: \$? = $ac_status" >&5
+  echo "$as_me:17677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -17682,7 +17683,7 @@ cat "conftest.$ac_ext" >&5
 cf_x509_support=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:17685: result: $cf_x509_support" >&5
+echo "$as_me:17686: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17737,7 +17738,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17740 "configure"
+#line 17741 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17749,16 +17750,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17755: \$? = $ac_status" >&5
+  echo "$as_me:17756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17761: \$? = $ac_status" >&5
+  echo "$as_me:17762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17775,7 +17776,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:17778: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17779: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17821,7 +17822,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17824 "configure"
+#line 17825 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17833,16 +17834,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17839: \$? = $ac_status" >&5
+  echo "$as_me:17840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17845: \$? = $ac_status" >&5
+  echo "$as_me:17846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17859,7 +17860,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:17862: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17863: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17877,7 +17878,7 @@ echo "${as_me:-configure}:17862: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:17880: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17881: 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
@@ -17902,7 +17903,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:17905: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17906: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17931,7 +17932,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:17934: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17935: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17940,7 +17941,7 @@ echo "${as_me:-configure}:17934: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:17943: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17944: 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
@@ -17958,12 +17959,12 @@ esac
 		(yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:17961: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:17962: 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}:17966: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:17967: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -18095,7 +18096,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:18098: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:18099: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -18117,7 +18118,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:18120: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18121: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -18137,12 +18138,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:18140: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18141: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18145 "configure"
+#line 18146 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18171,16 +18172,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18177: \$? = $ac_status" >&5
+  echo "$as_me:18178: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18183: \$? = $ac_status" >&5
+  echo "$as_me:18184: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18194,7 +18195,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18197 "configure"
+#line 18198 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18223,16 +18224,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18229: \$? = $ac_status" >&5
+  echo "$as_me:18230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18235: \$? = $ac_status" >&5
+  echo "$as_me:18236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18249,9 +18250,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:18252: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:18253: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:18254: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18255: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18342,7 +18343,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_gnutls" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:18345: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18346: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -18350,7 +18351,7 @@ echo "${as_me:-configure}:18345: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 18353 "configure"
+#line 18354 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18379,21 +18380,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18385: \$? = $ac_status" >&5
+  echo "$as_me:18386: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18391: \$? = $ac_status" >&5
+  echo "$as_me:18392: \$? = $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}:18396: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18397: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18411,7 +18412,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:18414: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18415: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -18486,13 +18487,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_gnutls" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:18489: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18490: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 18495 "configure"
+#line 18496 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18521,21 +18522,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18527: \$? = $ac_status" >&5
+  echo "$as_me:18528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18533: \$? = $ac_status" >&5
+  echo "$as_me:18534: \$? = $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}:18538: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18539: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -18615,7 +18616,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18618 "configure"
+#line 18619 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18627,16 +18628,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18631: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18633: \$? = $ac_status" >&5
+  echo "$as_me:18634: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18639: \$? = $ac_status" >&5
+  echo "$as_me:18640: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -18653,7 +18654,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:18656: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18657: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18694,7 +18695,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18697: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18698: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18723,13 +18724,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18726: checking for $ac_func" >&5
+echo "$as_me:18727: 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 18732 "configure"
+#line 18733 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18760,16 +18761,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18766: \$? = $ac_status" >&5
+  echo "$as_me:18767: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18772: \$? = $ac_status" >&5
+  echo "$as_me:18773: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18779,7 +18780,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18782: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18783: 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
@@ -18789,13 +18790,13 @@ EOF
 fi
 done
 
-		echo "$as_me:18792: checking for gnutls_rnd" >&5
+		echo "$as_me:18793: 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 18798 "configure"
+#line 18799 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18826,16 +18827,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18832: \$? = $ac_status" >&5
+  echo "$as_me:18833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18838: \$? = $ac_status" >&5
+  echo "$as_me:18839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -18845,7 +18846,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18848: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:18849: 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
 
@@ -18875,10 +18876,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:18878: checking for X509 support" >&5
+echo "$as_me:18879: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18881 "configure"
+#line 18882 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18907,16 +18908,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18913: \$? = $ac_status" >&5
+  echo "$as_me:18914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18919: \$? = $ac_status" >&5
+  echo "$as_me:18920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -18925,7 +18926,7 @@ cat "conftest.$ac_ext" >&5
 cf_x509_support=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:18928: result: $cf_x509_support" >&5
+echo "$as_me:18929: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -18979,7 +18980,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18982 "configure"
+#line 18983 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18991,16 +18992,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18997: \$? = $ac_status" >&5
+  echo "$as_me:18998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19003: \$? = $ac_status" >&5
+  echo "$as_me:19004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19017,7 +19018,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:19020: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19021: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19063,7 +19064,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19066 "configure"
+#line 19067 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19075,16 +19076,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19081: \$? = $ac_status" >&5
+  echo "$as_me:19082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19087: \$? = $ac_status" >&5
+  echo "$as_me:19088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19101,7 +19102,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:19104: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19105: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19119,7 +19120,7 @@ echo "${as_me:-configure}:19104: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:19122: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19123: 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
@@ -19144,7 +19145,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19147: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19148: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19173,7 +19174,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19176: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19177: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19182,7 +19183,7 @@ echo "${as_me:-configure}:19176: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:19185: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19186: 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
@@ -19200,12 +19201,12 @@ esac
 		(yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:19203: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:19204: 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}:19208: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19209: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -19337,7 +19338,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:19340: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:19341: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -19359,7 +19360,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:19362: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19363: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -19379,12 +19380,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:19382: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19383: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19387 "configure"
+#line 19388 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19413,16 +19414,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19419: \$? = $ac_status" >&5
+  echo "$as_me:19420: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19425: \$? = $ac_status" >&5
+  echo "$as_me:19426: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19436,7 +19437,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19439 "configure"
+#line 19440 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19465,16 +19466,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19471: \$? = $ac_status" >&5
+  echo "$as_me:19472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19477: \$? = $ac_status" >&5
+  echo "$as_me:19478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19491,9 +19492,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:19494: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:19495: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:19496: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19497: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19584,7 +19585,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_gnutls" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:19587: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19588: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -19592,7 +19593,7 @@ echo "${as_me:-configure}:19587: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19595 "configure"
+#line 19596 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19621,21 +19622,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19627: \$? = $ac_status" >&5
+  echo "$as_me:19628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19633: \$? = $ac_status" >&5
+  echo "$as_me:19634: \$? = $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}:19638: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19639: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19653,7 +19654,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:19656: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19657: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -19728,13 +19729,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_gnutls" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:19731: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19732: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 19737 "configure"
+#line 19738 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19763,21 +19764,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19769: \$? = $ac_status" >&5
+  echo "$as_me:19770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19775: \$? = $ac_status" >&5
+  echo "$as_me:19776: \$? = $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}:19780: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19781: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -19857,7 +19858,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19860 "configure"
+#line 19861 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19869,16 +19870,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19875: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $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:19879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19881: \$? = $ac_status" >&5
+  echo "$as_me:19882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19895,7 +19896,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:19898: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19899: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19936,7 +19937,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19939: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19940: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19965,13 +19966,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19968: checking for $ac_func" >&5
+echo "$as_me:19969: 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 19974 "configure"
+#line 19975 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20002,16 +20003,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20008: \$? = $ac_status" >&5
+  echo "$as_me:20009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20014: \$? = $ac_status" >&5
+  echo "$as_me:20015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20021,7 +20022,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20024: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20025: 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
@@ -20031,13 +20032,13 @@ EOF
 fi
 done
 
-		echo "$as_me:20034: checking for gnutls_rnd" >&5
+		echo "$as_me:20035: 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 20040 "configure"
+#line 20041 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20068,16 +20069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20074: \$? = $ac_status" >&5
+  echo "$as_me:20075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20080: \$? = $ac_status" >&5
+  echo "$as_me:20081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -20087,7 +20088,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20090: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:20091: 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
 
@@ -20116,7 +20117,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:20119: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:20120: 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
@@ -20124,7 +20125,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20127 "configure"
+#line 20128 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20143,16 +20144,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20149: \$? = $ac_status" >&5
+  echo "$as_me:20150: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20155: \$? = $ac_status" >&5
+  echo "$as_me:20156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -20163,7 +20164,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20166: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:20167: 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
 
@@ -20184,7 +20185,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:20187: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:20188: 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
@@ -20192,7 +20193,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20195 "configure"
+#line 20196 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20211,16 +20212,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20217: \$? = $ac_status" >&5
+  echo "$as_me:20218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20223: \$? = $ac_status" >&5
+  echo "$as_me:20224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -20231,7 +20232,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20234: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:20235: 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
 
@@ -20252,7 +20253,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:20255: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:20256: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20261,10 +20262,10 @@ fi
 
 			fi
 
-echo "$as_me:20264: checking for X509 support" >&5
+echo "$as_me:20265: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20267 "configure"
+#line 20268 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20293,16 +20294,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20299: \$? = $ac_status" >&5
+  echo "$as_me:20300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20305: \$? = $ac_status" >&5
+  echo "$as_me:20306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -20311,7 +20312,7 @@ cat "conftest.$ac_ext" >&5
 cf_x509_support=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:20314: result: $cf_x509_support" >&5
+echo "$as_me:20315: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -20343,7 +20344,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:20346: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:20347: 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
@@ -20351,7 +20352,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20354 "configure"
+#line 20355 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20370,16 +20371,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20376: \$? = $ac_status" >&5
+  echo "$as_me:20377: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20382: \$? = $ac_status" >&5
+  echo "$as_me:20383: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -20390,7 +20391,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20393: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:20394: 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
@@ -20405,11 +20406,11 @@ else
 		if test -d "$cf_ssl_root" ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me:-configure}:20408: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:20409: 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:20412: error: cannot find NSS compliant libraries" >&5
+			{ { echo "$as_me:20413: error: cannot find NSS compliant libraries" >&5
 echo "$as_me: error: cannot find NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -20424,13 +20425,13 @@ fi
 		elif test -d "$cf_cv_use_libnss_compat/../include" ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:20427: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:20428: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compliant 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:20433: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:20434: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -20559,10 +20560,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:20562: checking for NSS compliant include directory" >&5
+echo "$as_me:20563: checking for NSS compliant include directory" >&5
 echo $ECHO_N "checking for NSS compliant include directory... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20565 "configure"
+#line 20566 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20576,16 +20577,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20582: \$? = $ac_status" >&5
+  echo "$as_me:20583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20588: \$? = $ac_status" >&5
+  echo "$as_me:20589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_incl=yes
 else
@@ -20594,7 +20595,7 @@ cat "conftest.$ac_ext" >&5
 cf_ssl_incl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20597: result: $cf_ssl_incl" >&5
+echo "$as_me:20598: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -20603,10 +20604,10 @@ EOF
 
 fi
 
-echo "$as_me:20606: checking if we can link to NSS compliant library" >&5
+echo "$as_me:20607: checking if we can link to NSS compliant library" >&5
 echo $ECHO_N "checking if we can link to NSS compliant library... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20609 "configure"
+#line 20610 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20625,16 +20626,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20631: \$? = $ac_status" >&5
+  echo "$as_me:20632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20637: \$? = $ac_status" >&5
+  echo "$as_me:20638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_library=yes
 else
@@ -20643,7 +20644,7 @@ cat "conftest.$ac_ext" >&5
 cf_ssl_library=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:20646: result: $cf_ssl_library" >&5
+echo "$as_me:20647: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -20656,7 +20657,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:20659: error: Cannot link with NSS compliant libraries" >&5
+	{ { echo "$as_me:20660: error: Cannot link with NSS compliant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20664,7 +20665,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:20667: checking whether to enable ipv6" >&5
+echo "$as_me:20668: 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.
@@ -20681,11 +20682,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:20684: result: $enableval" >&5
+echo "$as_me:20685: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:20688: checking ipv6 stack type" >&5
+echo "$as_me:20689: 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
@@ -20706,7 +20707,7 @@ do
 		;;
 	(inria)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20709 "configure"
+#line 20710 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20723,7 +20724,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20726 "configure"
+#line 20727 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20740,7 +20741,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20743 "configure"
+#line 20744 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -20766,7 +20767,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20769 "configure"
+#line 20770 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20783,7 +20784,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20786 "configure"
+#line 20787 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -20800,7 +20801,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20803 "configure"
+#line 20804 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20822,13 +20823,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:20825: result: $cf_cv_ipv6type" >&5
+echo "$as_me:20826: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:20831: checking for IPv6 library if required" >&5
+echo "$as_me:20832: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case "$cf_cv_ipv6type" in
 (solaris)
@@ -20858,13 +20859,13 @@ case "$cf_cv_ipv6type" in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:20861: result: $cf_ipv6lib" >&5
+echo "$as_me:20862: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20867 "configure"
+#line 20868 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20880,16 +20881,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20886: \$? = $ac_status" >&5
+  echo "$as_me:20887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20892: \$? = $ac_status" >&5
+  echo "$as_me:20893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21010,7 +21011,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21013 "configure"
+#line 21014 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21022,16 +21023,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21028: \$? = $ac_status" >&5
+  echo "$as_me:21029: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21034: \$? = $ac_status" >&5
+  echo "$as_me:21035: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21048,7 +21049,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21051: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21052: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21076,13 +21077,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 	eval 'cf_cv_have_lib_'"$cf_ipv6lib"'=no'
 	cf_libdir=""
-	echo "$as_me:21079: checking for getaddrinfo" >&5
+	echo "$as_me:21080: 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 21085 "configure"
+#line 21086 "configure"
 #include "confdefs.h"
 #define getaddrinfo autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21113,16 +21114,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21119: \$? = $ac_status" >&5
+  echo "$as_me:21120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21125: \$? = $ac_status" >&5
+  echo "$as_me:21126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -21132,18 +21133,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21135: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:21136: 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:21142: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:21143: 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 21146 "configure"
+#line 21147 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21159,25 +21160,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21165: \$? = $ac_status" >&5
+  echo "$as_me:21166: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21171: \$? = $ac_status" >&5
+  echo "$as_me:21172: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21173: result: yes" >&5
+  echo "$as_me:21174: 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:21180: result: no" >&5
+echo "$as_me:21181: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21245,11 +21246,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21248: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:21249: 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 21252 "configure"
+#line 21253 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21265,25 +21266,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21271: \$? = $ac_status" >&5
+  echo "$as_me:21272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21277: \$? = $ac_status" >&5
+  echo "$as_me:21278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21279: result: yes" >&5
+  echo "$as_me:21280: 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:21286: result: no" >&5
+echo "$as_me:21287: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21298,7 +21299,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_ipv6lib"\"
 
 	if test "$cf_found_library" = no ; then
-		{ { echo "$as_me:21301: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:21302: 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;}
@@ -21306,7 +21307,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:21309: checking working getaddrinfo" >&5
+echo "$as_me:21310: 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
@@ -21316,7 +21317,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21319 "configure"
+#line 21320 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21396,15 +21397,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21402: \$? = $ac_status" >&5
+  echo "$as_me:21403: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21407: \$? = $ac_status" >&5
+  echo "$as_me:21408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -21417,7 +21418,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21420: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:21421: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -21433,12 +21434,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:21436: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:21437: 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:21441: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:21442: 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.
@@ -21449,7 +21450,7 @@ fi
 
 fi
 
-echo "$as_me:21452: checking for screen type" >&5
+echo "$as_me:21453: 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
@@ -21463,7 +21464,7 @@ case "$withval" in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:21466: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:21467: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21472,13 +21473,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:21475: result: $cf_cv_screen" >&5
+echo "$as_me:21476: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case "$cf_cv_screen" in
 (curses|ncurses*)
 
-echo "$as_me:21481: checking for specific curses-directory" >&5
+echo "$as_me:21482: 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.
@@ -21488,7 +21489,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:21491: result: $cf_cv_curses_dir" >&5
+echo "$as_me:21492: 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"
@@ -21519,7 +21520,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:21522: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:21523: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21555,7 +21556,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21558 "configure"
+#line 21559 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21567,16 +21568,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21573: \$? = $ac_status" >&5
+  echo "$as_me:21574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21579: \$? = $ac_status" >&5
+  echo "$as_me:21580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21593,7 +21594,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21596: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21597: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21629,7 +21630,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:21632: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21633: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21648,7 +21649,7 @@ dft_color_style=yes
 case "$cf_cv_screen" in
 (curses)
 
-echo "$as_me:21651: checking for extra include directories" >&5
+echo "$as_me:21652: 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
@@ -21674,7 +21675,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:21677: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:21678: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -21684,7 +21685,7 @@ then
 
 fi
 
-echo "$as_me:21687: checking if we have identified curses headers" >&5
+echo "$as_me:21688: 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
@@ -21696,7 +21697,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21699 "configure"
+#line 21700 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21708,16 +21709,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21712: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21714: \$? = $ac_status" >&5
+  echo "$as_me:21715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21720: \$? = $ac_status" >&5
+  echo "$as_me:21721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21728,11 +21729,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21731: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21732: 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:21735: error: No curses header-files found" >&5
+	{ { echo "$as_me:21736: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21742,23 +21743,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21745: checking for $ac_header" >&5
+echo "$as_me:21746: 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 21751 "configure"
+#line 21752 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21755: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21756: \"$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:21761: \$? = $ac_status" >&5
+  echo "$as_me:21762: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21777,7 +21778,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:21780: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21781: 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
@@ -21787,7 +21788,7 @@ EOF
 fi
 done
 
-echo "$as_me:21790: checking for terminfo header" >&5
+echo "$as_me:21791: 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
@@ -21805,7 +21806,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21808 "configure"
+#line 21809 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21820,16 +21821,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21826: \$? = $ac_status" >&5
+  echo "$as_me:21827: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21832: \$? = $ac_status" >&5
+  echo "$as_me:21833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21845,7 +21846,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21848: result: $cf_cv_term_header" >&5
+echo "$as_me:21849: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21877,7 +21878,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21880: checking for ncurses version" >&5
+echo "$as_me:21881: 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
@@ -21903,10 +21904,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21906: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21907: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21909: \$? = $ac_status" >&5
+  echo "$as_me:21910: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -21916,7 +21917,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21919 "configure"
+#line 21920 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21941,15 +21942,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21947: \$? = $ac_status" >&5
+  echo "$as_me:21948: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21952: \$? = $ac_status" >&5
+  echo "$as_me:21953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21963,17 +21964,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:21966: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21967: 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:21973: checking if we have identified curses libraries" >&5
+echo "$as_me:21974: 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 21976 "configure"
+#line 21977 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21985,16 +21986,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21991: \$? = $ac_status" >&5
+  echo "$as_me:21992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21997: \$? = $ac_status" >&5
+  echo "$as_me:21998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22003,13 +22004,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:22006: result: $cf_result" >&5
+echo "$as_me:22007: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:22012: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:22013: 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
@@ -22017,7 +22018,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22020 "configure"
+#line 22021 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22036,16 +22037,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22042: \$? = $ac_status" >&5
+  echo "$as_me:22043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22048: \$? = $ac_status" >&5
+  echo "$as_me:22049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22056,7 +22057,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22059: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22060: 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
 
@@ -22086,7 +22087,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:22089: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:22090: 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
@@ -22094,7 +22095,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22097 "configure"
+#line 22098 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22113,16 +22114,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22119: \$? = $ac_status" >&5
+  echo "$as_me:22120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22125: \$? = $ac_status" >&5
+  echo "$as_me:22126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -22133,7 +22134,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22136: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:22137: 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
 
@@ -22157,7 +22158,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:22160: checking for initscr in -lHcurses" >&5
+		echo "$as_me:22161: 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
@@ -22165,7 +22166,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22168 "configure"
+#line 22169 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22184,16 +22185,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22190: \$? = $ac_status" >&5
+  echo "$as_me:22191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22196: \$? = $ac_status" >&5
+  echo "$as_me:22197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -22204,7 +22205,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22207: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:22208: 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
 
@@ -22262,7 +22263,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:22265: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22266: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22291,7 +22292,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:22294: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22295: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22322,7 +22323,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:22325: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22326: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22357,7 +22358,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:22360: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22361: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22401,13 +22402,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:22404: checking for tgoto" >&5
+		echo "$as_me:22405: 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 22410 "configure"
+#line 22411 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22438,16 +22439,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22444: \$? = $ac_status" >&5
+  echo "$as_me:22445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22450: \$? = $ac_status" >&5
+  echo "$as_me:22451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -22457,7 +22458,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22460: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:22461: 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
@@ -22466,7 +22467,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:22469: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:22470: 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
@@ -22474,7 +22475,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22477 "configure"
+#line 22478 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22493,16 +22494,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22499: \$? = $ac_status" >&5
+  echo "$as_me:22500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22505: \$? = $ac_status" >&5
+  echo "$as_me:22506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -22513,7 +22514,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22516: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:22517: 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
 
@@ -22536,10 +22537,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:22539: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:22540: 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 22542 "configure"
+#line 22543 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22551,16 +22552,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22557: \$? = $ac_status" >&5
+  echo "$as_me:22558: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22563: \$? = $ac_status" >&5
+  echo "$as_me:22564: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22569,16 +22570,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:22572: result: $cf_result" >&5
+				echo "$as_me:22573: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:22578: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:22579: 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 22581 "configure"
+#line 22582 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22590,16 +22591,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22596: \$? = $ac_status" >&5
+  echo "$as_me:22597: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22602: \$? = $ac_status" >&5
+  echo "$as_me:22603: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -22608,7 +22609,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 22611 "configure"
+#line 22612 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22620,16 +22621,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22626: \$? = $ac_status" >&5
+  echo "$as_me:22627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22632: \$? = $ac_status" >&5
+  echo "$as_me:22633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22641,19 +22642,19 @@ 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:22644: result: $cf_result" >&5
+				echo "$as_me:22645: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:22650: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:22651: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
 
-echo "$as_me:22656: checking for curses performance tradeoff" >&5
+echo "$as_me:22657: 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
@@ -22661,7 +22662,7 @@ else
 
     cf_cv_curs_performance=no
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 22664 "configure"
+#line 22665 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22680,20 +22681,20 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22686: \$? = $ac_status" >&5
+  echo "$as_me:22687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22692: \$? = $ac_status" >&5
+  echo "$as_me:22693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22696 "configure"
+#line 22697 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -22713,16 +22714,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22719: \$? = $ac_status" >&5
+  echo "$as_me:22720: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22725: \$? = $ac_status" >&5
+  echo "$as_me:22726: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -22737,21 +22738,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22740: result: $cf_cv_curs_performance" >&5
+echo "$as_me:22741: 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:22747: checking for curses touchline function" >&5
+echo "$as_me:22748: 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 22754 "configure"
+#line 22755 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22764,23 +22765,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22770: \$? = $ac_status" >&5
+  echo "$as_me:22771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22776: \$? = $ac_status" >&5
+  echo "$as_me:22777: \$? = $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 22783 "configure"
+#line 22784 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22793,16 +22794,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22799: \$? = $ac_status" >&5
+  echo "$as_me:22800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22805: \$? = $ac_status" >&5
+  echo "$as_me:22806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -22814,7 +22815,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22817: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:22818: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -22839,23 +22840,23 @@ esac
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22842: checking for $ac_header" >&5
+echo "$as_me:22843: 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 22848 "configure"
+#line 22849 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22853: \"$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:22858: \$? = $ac_status" >&5
+  echo "$as_me:22859: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22874,7 +22875,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22877: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22878: 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
@@ -22884,7 +22885,7 @@ EOF
 fi
 done
 
-echo "$as_me:22887: checking for multibyte character support" >&5
+echo "$as_me:22888: 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
@@ -22892,7 +22893,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22895 "configure"
+#line 22896 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22910,16 +22911,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22916: \$? = $ac_status" >&5
+  echo "$as_me:22917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22922: \$? = $ac_status" >&5
+  echo "$as_me:22923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -22931,12 +22932,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:22934: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:22935: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22939 "configure"
+#line 22940 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22949,16 +22950,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22955: \$? = $ac_status" >&5
+  echo "$as_me:22956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22961: \$? = $ac_status" >&5
+  echo "$as_me:22962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -22972,7 +22973,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22975 "configure"
+#line 22976 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22985,16 +22986,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22991: \$? = $ac_status" >&5
+  echo "$as_me:22992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22997: \$? = $ac_status" >&5
+  echo "$as_me:22998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -23011,9 +23012,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:23014: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:23015: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:23016: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23017: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23104,7 +23105,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_utf8" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:23107: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23108: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -23112,7 +23113,7 @@ echo "${as_me:-configure}:23107: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23115 "configure"
+#line 23116 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23125,21 +23126,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23131: \$? = $ac_status" >&5
+  echo "$as_me:23132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23137: \$? = $ac_status" >&5
+  echo "$as_me:23138: \$? = $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}:23142: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23143: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23157,7 +23158,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:23160: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23161: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -23232,13 +23233,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_utf8" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:23235: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23236: 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 23241 "configure"
+#line 23242 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23251,21 +23252,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23257: \$? = $ac_status" >&5
+  echo "$as_me:23258: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23263: \$? = $ac_status" >&5
+  echo "$as_me:23264: \$? = $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}:23268: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23269: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -23307,7 +23308,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23310: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:23311: 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
@@ -23345,7 +23346,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 23348 "configure"
+#line 23349 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23357,16 +23358,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23363: \$? = $ac_status" >&5
+  echo "$as_me:23364: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23369: \$? = $ac_status" >&5
+  echo "$as_me:23370: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -23383,7 +23384,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:23386: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23387: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23419,7 +23420,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:23422: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23423: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -23449,13 +23450,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:23452: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:23453: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:23455: result: yes" >&5
+		echo "$as_me:23456: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:23458: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:23459: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -23588,7 +23589,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23591 "configure"
+#line 23592 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23600,37 +23601,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23606: \$? = $ac_status" >&5
+  echo "$as_me:23607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23612: \$? = $ac_status" >&5
+  echo "$as_me:23613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23618 "configure"
+#line 23619 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23628: \$? = $ac_status" >&5
+  echo "$as_me:23629: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23633: \$? = $ac_status" >&5
+  echo "$as_me:23634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -23804,7 +23805,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23807 "configure"
+#line 23808 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23816,37 +23817,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23822: \$? = $ac_status" >&5
+  echo "$as_me:23823: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23828: \$? = $ac_status" >&5
+  echo "$as_me:23829: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23834 "configure"
+#line 23835 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23844: \$? = $ac_status" >&5
+  echo "$as_me:23845: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23849: \$? = $ac_status" >&5
+  echo "$as_me:23850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -23863,7 +23864,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:23866: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:23867: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -23879,7 +23880,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:23882: checking for terminfo header" >&5
+echo "$as_me:23883: 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
@@ -23897,7 +23898,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23900 "configure"
+#line 23901 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -23912,16 +23913,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23918: \$? = $ac_status" >&5
+  echo "$as_me:23919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23924: \$? = $ac_status" >&5
+  echo "$as_me:23925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -23937,7 +23938,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23940: result: $cf_cv_term_header" >&5
+echo "$as_me:23941: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -23972,7 +23973,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:23975: result: no" >&5
+		echo "$as_me:23976: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -23988,7 +23989,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:23991: checking for $ac_word" >&5
+echo "$as_me:23992: 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
@@ -24003,7 +24004,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:24006: found $ac_dir/$ac_word" >&5
+echo "$as_me:24007: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24011,10 +24012,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:24014: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:24015: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24017: result: no" >&5
+  echo "$as_me:24018: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24027,7 +24028,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:24030: checking for $ac_word" >&5
+echo "$as_me:24031: 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
@@ -24042,7 +24043,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:24045: found $ac_dir/$ac_word" >&5
+echo "$as_me:24046: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24050,10 +24051,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:24053: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:24054: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24056: result: no" >&5
+  echo "$as_me:24057: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24210,7 +24211,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:24213: checking if we have identified curses headers" >&5
+echo "$as_me:24214: 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
@@ -24222,7 +24223,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24225 "configure"
+#line 24226 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -24234,16 +24235,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24240: \$? = $ac_status" >&5
+  echo "$as_me:24241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24246: \$? = $ac_status" >&5
+  echo "$as_me:24247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -24254,11 +24255,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24257: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:24258: 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:24261: error: No curses header-files found" >&5
+	{ { echo "$as_me:24262: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24268,23 +24269,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24271: checking for $ac_header" >&5
+echo "$as_me:24272: 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 24277 "configure"
+#line 24278 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24281: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24282: \"$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:24287: \$? = $ac_status" >&5
+  echo "$as_me:24288: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24303,7 +24304,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24306: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24307: 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
@@ -24359,7 +24360,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24362 "configure"
+#line 24363 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24371,16 +24372,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24374: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24375: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24377: \$? = $ac_status" >&5
+  echo "$as_me:24378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24383: \$? = $ac_status" >&5
+  echo "$as_me:24384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24397,7 +24398,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24400: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24401: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24416,7 +24417,7 @@ fi
 
 }
 
-echo "$as_me:24419: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:24420: 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
@@ -24428,7 +24429,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24431 "configure"
+#line 24432 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24452,16 +24453,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24458: \$? = $ac_status" >&5
+  echo "$as_me:24459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24464: \$? = $ac_status" >&5
+  echo "$as_me:24465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -24476,14 +24477,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:24479: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:24480: 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:24486: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:24487: 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
@@ -24604,7 +24605,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24607 "configure"
+#line 24608 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24616,16 +24617,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24622: \$? = $ac_status" >&5
+  echo "$as_me:24623: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24628: \$? = $ac_status" >&5
+  echo "$as_me:24629: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24642,7 +24643,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24645: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24646: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24665,7 +24666,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24668 "configure"
+#line 24669 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24689,16 +24690,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24695: \$? = $ac_status" >&5
+  echo "$as_me:24696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24701: \$? = $ac_status" >&5
+  echo "$as_me:24702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -24719,12 +24720,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24722: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24723: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:24727: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:24728: 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%/[^/]*$%%'`
@@ -24760,7 +24761,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24763 "configure"
+#line 24764 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24772,16 +24773,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24778: \$? = $ac_status" >&5
+  echo "$as_me:24779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24784: \$? = $ac_status" >&5
+  echo "$as_me:24785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24798,7 +24799,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:24801: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24802: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24846,7 +24847,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:24849: checking for terminfo header" >&5
+echo "$as_me:24850: 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
@@ -24864,7 +24865,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24867 "configure"
+#line 24868 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -24879,16 +24880,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24883: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24885: \$? = $ac_status" >&5
+  echo "$as_me:24886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24891: \$? = $ac_status" >&5
+  echo "$as_me:24892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -24904,7 +24905,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24907: result: $cf_cv_term_header" >&5
+echo "$as_me:24908: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -24942,7 +24943,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:24945: checking for ncurses version" >&5
+echo "$as_me:24946: 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
@@ -24968,10 +24969,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:24971: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:24972: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:24974: \$? = $ac_status" >&5
+  echo "$as_me:24975: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -24981,7 +24982,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24984 "configure"
+#line 24985 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -25006,15 +25007,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:25009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25012: \$? = $ac_status" >&5
+  echo "$as_me:25013: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25017: \$? = $ac_status" >&5
+  echo "$as_me:25018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -25028,7 +25029,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:25031: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:25032: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -25041,7 +25042,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:25044: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:25045: 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
@@ -25049,7 +25050,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25052 "configure"
+#line 25053 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25068,16 +25069,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25074: \$? = $ac_status" >&5
+  echo "$as_me:25075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25080: \$? = $ac_status" >&5
+  echo "$as_me:25081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -25088,10 +25089,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25091: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:25092: 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:25094: checking for initscr in -lgpm" >&5
+  echo "$as_me:25095: 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
@@ -25099,7 +25100,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25102 "configure"
+#line 25103 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25118,16 +25119,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25124: \$? = $ac_status" >&5
+  echo "$as_me:25125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25130: \$? = $ac_status" >&5
+  echo "$as_me:25131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -25138,7 +25139,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25141: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:25142: 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"
@@ -25153,7 +25154,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:25156: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:25157: 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
@@ -25161,7 +25162,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25164 "configure"
+#line 25165 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25180,16 +25181,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25186: \$? = $ac_status" >&5
+  echo "$as_me:25187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25192: \$? = $ac_status" >&5
+  echo "$as_me:25193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -25200,7 +25201,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25203: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:25204: 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"
@@ -25249,13 +25250,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:25252: checking for initscr" >&5
+	echo "$as_me:25253: 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 25258 "configure"
+#line 25259 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25286,16 +25287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25292: \$? = $ac_status" >&5
+  echo "$as_me:25293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25298: \$? = $ac_status" >&5
+  echo "$as_me:25299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -25305,18 +25306,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:25308: result: $ac_cv_func_initscr" >&5
+echo "$as_me:25309: 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:25315: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:25316: 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 25319 "configure"
+#line 25320 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25328,25 +25329,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25334: \$? = $ac_status" >&5
+  echo "$as_me:25335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25340: \$? = $ac_status" >&5
+  echo "$as_me:25341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25342: result: yes" >&5
+  echo "$as_me:25343: 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:25349: result: no" >&5
+echo "$as_me:25350: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25414,11 +25415,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25417: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:25418: 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 25421 "configure"
+#line 25422 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25430,25 +25431,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25436: \$? = $ac_status" >&5
+  echo "$as_me:25437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25442: \$? = $ac_status" >&5
+  echo "$as_me:25443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25444: result: yes" >&5
+  echo "$as_me:25445: 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:25451: result: no" >&5
+echo "$as_me:25452: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25463,7 +25464,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:25466: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:25467: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25471,7 +25472,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:25474: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:25475: 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
@@ -25481,7 +25482,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25484 "configure"
+#line 25485 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25493,23 +25494,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25499: \$? = $ac_status" >&5
+  echo "$as_me:25500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25505: \$? = $ac_status" >&5
+  echo "$as_me:25506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25507: result: yes" >&5
+  echo "$as_me:25508: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:25512: result: no" >&5
+echo "$as_me:25513: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -25535,13 +25536,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:25538: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:25539: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:25541: result: yes" >&5
+		echo "$as_me:25542: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:25544: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:25545: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -25674,7 +25675,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 25677 "configure"
+#line 25678 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25686,37 +25687,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25692: \$? = $ac_status" >&5
+  echo "$as_me:25693: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25698: \$? = $ac_status" >&5
+  echo "$as_me:25699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25704 "configure"
+#line 25705 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:25711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25714: \$? = $ac_status" >&5
+  echo "$as_me:25715: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25719: \$? = $ac_status" >&5
+  echo "$as_me:25720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -25890,7 +25891,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25893 "configure"
+#line 25894 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25902,37 +25903,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25908: \$? = $ac_status" >&5
+  echo "$as_me:25909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25914: \$? = $ac_status" >&5
+  echo "$as_me:25915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25920 "configure"
+#line 25921 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:25927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25930: \$? = $ac_status" >&5
+  echo "$as_me:25931: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25935: \$? = $ac_status" >&5
+  echo "$as_me:25936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -25949,7 +25950,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:25952: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:25953: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -25965,7 +25966,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:25968: checking for terminfo header" >&5
+echo "$as_me:25969: 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
@@ -25983,7 +25984,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25986 "configure"
+#line 25987 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -25998,16 +25999,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26004: \$? = $ac_status" >&5
+  echo "$as_me:26005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26010: \$? = $ac_status" >&5
+  echo "$as_me:26011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -26023,7 +26024,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26026: result: $cf_cv_term_header" >&5
+echo "$as_me:26027: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -26058,7 +26059,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:26061: result: no" >&5
+		echo "$as_me:26062: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -26074,7 +26075,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:26077: checking for $ac_word" >&5
+echo "$as_me:26078: 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
@@ -26089,7 +26090,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:26092: found $ac_dir/$ac_word" >&5
+echo "$as_me:26093: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26097,10 +26098,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:26100: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:26101: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26103: result: no" >&5
+  echo "$as_me:26104: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26113,7 +26114,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:26116: checking for $ac_word" >&5
+echo "$as_me:26117: 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
@@ -26128,7 +26129,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:26131: found $ac_dir/$ac_word" >&5
+echo "$as_me:26132: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26136,10 +26137,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:26139: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:26140: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26142: result: no" >&5
+  echo "$as_me:26143: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26296,7 +26297,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:26299: checking if we have identified curses headers" >&5
+echo "$as_me:26300: 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
@@ -26308,7 +26309,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26311 "configure"
+#line 26312 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -26320,16 +26321,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26326: \$? = $ac_status" >&5
+  echo "$as_me:26327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26332: \$? = $ac_status" >&5
+  echo "$as_me:26333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -26340,11 +26341,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26343: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:26344: 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:26347: error: No curses header-files found" >&5
+	{ { echo "$as_me:26348: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26354,23 +26355,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26357: checking for $ac_header" >&5
+echo "$as_me:26358: 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 26363 "configure"
+#line 26364 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26368: \"$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:26373: \$? = $ac_status" >&5
+  echo "$as_me:26374: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26389,7 +26390,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26392: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26393: 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
@@ -26445,7 +26446,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26448 "configure"
+#line 26449 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26457,16 +26458,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26461: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26463: \$? = $ac_status" >&5
+  echo "$as_me:26464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26469: \$? = $ac_status" >&5
+  echo "$as_me:26470: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26483,7 +26484,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:26486: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26487: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26502,7 +26503,7 @@ fi
 
 }
 
-echo "$as_me:26505: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:26506: 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
@@ -26514,7 +26515,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26517 "configure"
+#line 26518 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26538,16 +26539,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26544: \$? = $ac_status" >&5
+  echo "$as_me:26545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26550: \$? = $ac_status" >&5
+  echo "$as_me:26551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -26562,14 +26563,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:26565: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:26566: 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:26572: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:26573: 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
@@ -26690,7 +26691,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26693 "configure"
+#line 26694 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26702,16 +26703,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26708: \$? = $ac_status" >&5
+  echo "$as_me:26709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26714: \$? = $ac_status" >&5
+  echo "$as_me:26715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26728,7 +26729,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:26731: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26732: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26751,7 +26752,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26754 "configure"
+#line 26755 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26775,16 +26776,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26781: \$? = $ac_status" >&5
+  echo "$as_me:26782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26787: \$? = $ac_status" >&5
+  echo "$as_me:26788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -26805,12 +26806,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26808: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26809: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:26813: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:26814: 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%/[^/]*$%%'`
@@ -26846,7 +26847,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26849 "configure"
+#line 26850 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26858,16 +26859,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26864: \$? = $ac_status" >&5
+  echo "$as_me:26865: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26870: \$? = $ac_status" >&5
+  echo "$as_me:26871: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26884,7 +26885,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:26887: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26888: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26932,7 +26933,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26935: checking for terminfo header" >&5
+echo "$as_me:26936: 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
@@ -26950,7 +26951,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26953 "configure"
+#line 26954 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -26965,16 +26966,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26971: \$? = $ac_status" >&5
+  echo "$as_me:26972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26977: \$? = $ac_status" >&5
+  echo "$as_me:26978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -26990,7 +26991,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26993: result: $cf_cv_term_header" >&5
+echo "$as_me:26994: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -27028,7 +27029,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:27031: checking for ncurses version" >&5
+echo "$as_me:27032: 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
@@ -27054,10 +27055,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:27057: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:27058: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:27060: \$? = $ac_status" >&5
+  echo "$as_me:27061: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -27067,7 +27068,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27070 "configure"
+#line 27071 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -27092,15 +27093,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27098: \$? = $ac_status" >&5
+  echo "$as_me:27099: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27103: \$? = $ac_status" >&5
+  echo "$as_me:27104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -27114,7 +27115,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:27117: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:27118: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -27127,7 +27128,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:27130: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:27131: 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
@@ -27135,7 +27136,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27138 "configure"
+#line 27139 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27154,16 +27155,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27160: \$? = $ac_status" >&5
+  echo "$as_me:27161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27166: \$? = $ac_status" >&5
+  echo "$as_me:27167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -27174,10 +27175,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27177: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:27178: 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:27180: checking for initscr in -lgpm" >&5
+  echo "$as_me:27181: 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
@@ -27185,7 +27186,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27188 "configure"
+#line 27189 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27204,16 +27205,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27210: \$? = $ac_status" >&5
+  echo "$as_me:27211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27216: \$? = $ac_status" >&5
+  echo "$as_me:27217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -27224,7 +27225,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27227: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:27228: 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"
@@ -27239,7 +27240,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:27242: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:27243: 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
@@ -27247,7 +27248,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27250 "configure"
+#line 27251 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27266,16 +27267,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27272: \$? = $ac_status" >&5
+  echo "$as_me:27273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27278: \$? = $ac_status" >&5
+  echo "$as_me:27279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -27286,7 +27287,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27289: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:27290: 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"
@@ -27335,13 +27336,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:27338: checking for initscr" >&5
+	echo "$as_me:27339: 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 27344 "configure"
+#line 27345 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -27372,16 +27373,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27378: \$? = $ac_status" >&5
+  echo "$as_me:27379: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27384: \$? = $ac_status" >&5
+  echo "$as_me:27385: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -27391,18 +27392,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:27394: result: $ac_cv_func_initscr" >&5
+echo "$as_me:27395: 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:27401: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:27402: 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 27405 "configure"
+#line 27406 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27414,25 +27415,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27420: \$? = $ac_status" >&5
+  echo "$as_me:27421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27426: \$? = $ac_status" >&5
+  echo "$as_me:27427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27428: result: yes" >&5
+  echo "$as_me:27429: 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:27435: result: no" >&5
+echo "$as_me:27436: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -27500,11 +27501,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:27503: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:27504: 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 27507 "configure"
+#line 27508 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27516,25 +27517,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27522: \$? = $ac_status" >&5
+  echo "$as_me:27523: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27528: \$? = $ac_status" >&5
+  echo "$as_me:27529: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27530: result: yes" >&5
+  echo "$as_me:27531: 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:27537: result: no" >&5
+echo "$as_me:27538: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -27549,7 +27550,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:27552: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:27553: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -27557,7 +27558,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:27560: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:27561: 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
@@ -27567,7 +27568,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27570 "configure"
+#line 27571 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27579,23 +27580,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27585: \$? = $ac_status" >&5
+  echo "$as_me:27586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27591: \$? = $ac_status" >&5
+  echo "$as_me:27592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27593: result: yes" >&5
+  echo "$as_me:27594: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:27598: result: no" >&5
+echo "$as_me:27599: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -27627,7 +27628,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:27630: checking for slang header file" >&5
+echo "$as_me:27631: 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
@@ -27635,7 +27636,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27638 "configure"
+#line 27639 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -27647,16 +27648,16 @@ printf("%s\\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27651: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27653: \$? = $ac_status" >&5
+  echo "$as_me:27654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27659: \$? = $ac_status" >&5
+  echo "$as_me:27660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -27761,7 +27762,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27764: result: $cf_cv_slang_header" >&5
+echo "$as_me:27765: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -27805,7 +27806,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 27808 "configure"
+#line 27809 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27817,16 +27818,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27823: \$? = $ac_status" >&5
+  echo "$as_me:27824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27829: \$? = $ac_status" >&5
+  echo "$as_me:27830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -27843,7 +27844,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:27846: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:27847: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -27875,7 +27876,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27878 "configure"
+#line 27879 "configure"
 #include "confdefs.h"
 
 int
@@ -27887,19 +27888,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27893: \$? = $ac_status" >&5
+  echo "$as_me:27894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27899: \$? = $ac_status" >&5
+  echo "$as_me:27900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27902 "configure"
+#line 27903 "configure"
 #include "confdefs.h"
 
 int
@@ -27911,16 +27912,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27917: \$? = $ac_status" >&5
+  echo "$as_me:27918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27923: \$? = $ac_status" >&5
+  echo "$as_me:27924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -27931,7 +27932,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me:-configure}:27934: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:27935: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -27946,10 +27947,10 @@ if test "$cf_cv_termlib" = none; then
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:27949: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:27950: 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 27952 "configure"
+#line 27953 "configure"
 #include "confdefs.h"
 
 int
@@ -27961,16 +27962,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27967: \$? = $ac_status" >&5
+  echo "$as_me:27968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27973: \$? = $ac_status" >&5
+  echo "$as_me:27974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -27979,7 +27980,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:27982: result: $cf_result" >&5
+			echo "$as_me:27983: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -27996,7 +27997,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:27999: checking for initscr in -lcurses" >&5
+	echo "$as_me:28000: 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
@@ -28004,7 +28005,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28007 "configure"
+#line 28008 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28023,16 +28024,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28029: \$? = $ac_status" >&5
+  echo "$as_me:28030: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28035: \$? = $ac_status" >&5
+  echo "$as_me:28036: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -28043,7 +28044,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28046: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:28047: 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
 
@@ -28065,7 +28066,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:28068: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:28069: 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
@@ -28073,7 +28074,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28076 "configure"
+#line 28077 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28092,16 +28093,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28098: \$? = $ac_status" >&5
+  echo "$as_me:28099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28104: \$? = $ac_status" >&5
+  echo "$as_me:28105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -28112,7 +28113,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28115: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:28116: 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
 
@@ -28139,20 +28140,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:28142: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:28143: 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:28149: checking for acos" >&5
+echo "$as_me:28150: 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 28155 "configure"
+#line 28156 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28183,16 +28184,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28189: \$? = $ac_status" >&5
+  echo "$as_me:28190: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28195: \$? = $ac_status" >&5
+  echo "$as_me:28196: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -28202,13 +28203,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28205: result: $ac_cv_func_acos" >&5
+echo "$as_me:28206: 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:28211: checking for acos in -lm" >&5
+echo "$as_me:28212: 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
@@ -28216,7 +28217,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28219 "configure"
+#line 28220 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28235,16 +28236,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28241: \$? = $ac_status" >&5
+  echo "$as_me:28242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28247: \$? = $ac_status" >&5
+  echo "$as_me:28248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -28255,7 +28256,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28258: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:28259: 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
 
@@ -28281,13 +28282,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:28284: checking for v_init" >&5
+	echo "$as_me:28285: 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 28290 "configure"
+#line 28291 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28318,16 +28319,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28324: \$? = $ac_status" >&5
+  echo "$as_me:28325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28330: \$? = $ac_status" >&5
+  echo "$as_me:28331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -28337,18 +28338,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28340: result: $ac_cv_func_v_init" >&5
+echo "$as_me:28341: 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:28347: checking for v_init in -lvideo" >&5
+		echo "$as_me:28348: 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 28351 "configure"
+#line 28352 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28360,25 +28361,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28366: \$? = $ac_status" >&5
+  echo "$as_me:28367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28372: \$? = $ac_status" >&5
+  echo "$as_me:28373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28374: result: yes" >&5
+  echo "$as_me:28375: 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:28381: result: no" >&5
+echo "$as_me:28382: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28446,11 +28447,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28449: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:28450: 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 28453 "configure"
+#line 28454 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28462,25 +28463,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28468: \$? = $ac_status" >&5
+  echo "$as_me:28469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28474: \$? = $ac_status" >&5
+  echo "$as_me:28475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28476: result: yes" >&5
+  echo "$as_me:28477: 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:28483: result: no" >&5
+echo "$as_me:28484: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28495,7 +28496,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28498: error: Cannot link video library" >&5
+	{ { echo "$as_me:28499: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -28505,13 +28506,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang"'=no'
 	cf_libdir=""
-	echo "$as_me:28508: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:28509: 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 28514 "configure"
+#line 28515 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28542,16 +28543,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28548: \$? = $ac_status" >&5
+  echo "$as_me:28549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28554: \$? = $ac_status" >&5
+  echo "$as_me:28555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -28561,18 +28562,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28564: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:28565: 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:28571: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:28572: 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 28575 "configure"
+#line 28576 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28584,25 +28585,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28590: \$? = $ac_status" >&5
+  echo "$as_me:28591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28596: \$? = $ac_status" >&5
+  echo "$as_me:28597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28598: result: yes" >&5
+  echo "$as_me:28599: 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:28605: result: no" >&5
+echo "$as_me:28606: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28670,11 +28671,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28673: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:28674: 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 28677 "configure"
+#line 28678 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28686,25 +28687,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28692: \$? = $ac_status" >&5
+  echo "$as_me:28693: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28698: \$? = $ac_status" >&5
+  echo "$as_me:28699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28700: result: yes" >&5
+  echo "$as_me:28701: 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:28707: result: no" >&5
+echo "$as_me:28708: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28719,13 +28720,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28722: error: Cannot link slang library" >&5
+	{ { echo "$as_me:28723: 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:28728: checking if we can link slang without termcap" >&5
+echo "$as_me:28729: 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%^.%%'`
@@ -28734,7 +28735,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28737 "configure"
+#line 28738 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28746,16 +28747,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28752: \$? = $ac_status" >&5
+  echo "$as_me:28753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28758: \$? = $ac_status" >&5
+  echo "$as_me:28759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28764,13 +28765,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:28767: result: $cf_result" >&5
+echo "$as_me:28768: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:28773: checking for slang2 header file" >&5
+echo "$as_me:28774: 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
@@ -28778,7 +28779,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28781 "configure"
+#line 28782 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28790,16 +28791,16 @@ printf("%s\\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28794: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28796: \$? = $ac_status" >&5
+  echo "$as_me:28797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28802: \$? = $ac_status" >&5
+  echo "$as_me:28803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -28904,7 +28905,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28907: result: $cf_cv_slang2_header" >&5
+echo "$as_me:28908: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -28948,7 +28949,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 28951 "configure"
+#line 28952 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28960,16 +28961,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28966: \$? = $ac_status" >&5
+  echo "$as_me:28967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28972: \$? = $ac_status" >&5
+  echo "$as_me:28973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -28986,7 +28987,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:28989: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:28990: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29018,7 +29019,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29021 "configure"
+#line 29022 "configure"
 #include "confdefs.h"
 
 int
@@ -29030,19 +29031,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29036: \$? = $ac_status" >&5
+  echo "$as_me:29037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29042: \$? = $ac_status" >&5
+  echo "$as_me:29043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 29045 "configure"
+#line 29046 "configure"
 #include "confdefs.h"
 
 int
@@ -29054,16 +29055,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29060: \$? = $ac_status" >&5
+  echo "$as_me:29061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29066: \$? = $ac_status" >&5
+  echo "$as_me:29067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -29074,7 +29075,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me:-configure}:29077: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:29078: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -29089,10 +29090,10 @@ if test "$cf_cv_termlib" = none; then
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:29092: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:29093: 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 29095 "configure"
+#line 29096 "configure"
 #include "confdefs.h"
 
 int
@@ -29104,16 +29105,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29110: \$? = $ac_status" >&5
+  echo "$as_me:29111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29116: \$? = $ac_status" >&5
+  echo "$as_me:29117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -29122,7 +29123,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:29125: result: $cf_result" >&5
+			echo "$as_me:29126: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -29139,7 +29140,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:29142: checking for initscr in -lcurses" >&5
+	echo "$as_me:29143: 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
@@ -29147,7 +29148,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29150 "configure"
+#line 29151 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29166,16 +29167,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29172: \$? = $ac_status" >&5
+  echo "$as_me:29173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29178: \$? = $ac_status" >&5
+  echo "$as_me:29179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -29186,7 +29187,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29189: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:29190: 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
 
@@ -29208,7 +29209,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:29211: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:29212: 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
@@ -29216,7 +29217,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29219 "configure"
+#line 29220 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29235,16 +29236,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29241: \$? = $ac_status" >&5
+  echo "$as_me:29242: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29247: \$? = $ac_status" >&5
+  echo "$as_me:29248: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -29255,7 +29256,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29258: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:29259: 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
 
@@ -29282,20 +29283,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:29285: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:29286: 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:29292: checking for acos" >&5
+echo "$as_me:29293: 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 29298 "configure"
+#line 29299 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29326,16 +29327,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29332: \$? = $ac_status" >&5
+  echo "$as_me:29333: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29338: \$? = $ac_status" >&5
+  echo "$as_me:29339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -29345,13 +29346,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29348: result: $ac_cv_func_acos" >&5
+echo "$as_me:29349: 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:29354: checking for acos in -lm" >&5
+echo "$as_me:29355: 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
@@ -29359,7 +29360,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29362 "configure"
+#line 29363 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29378,16 +29379,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29384: \$? = $ac_status" >&5
+  echo "$as_me:29385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29390: \$? = $ac_status" >&5
+  echo "$as_me:29391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -29398,7 +29399,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29401: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:29402: 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
 
@@ -29424,13 +29425,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:29427: checking for v_init" >&5
+	echo "$as_me:29428: 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 29433 "configure"
+#line 29434 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29461,16 +29462,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29467: \$? = $ac_status" >&5
+  echo "$as_me:29468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29473: \$? = $ac_status" >&5
+  echo "$as_me:29474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -29480,18 +29481,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29483: result: $ac_cv_func_v_init" >&5
+echo "$as_me:29484: 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:29490: checking for v_init in -lvideo" >&5
+		echo "$as_me:29491: 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 29494 "configure"
+#line 29495 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29503,25 +29504,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29509: \$? = $ac_status" >&5
+  echo "$as_me:29510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29515: \$? = $ac_status" >&5
+  echo "$as_me:29516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29517: result: yes" >&5
+  echo "$as_me:29518: 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:29524: result: no" >&5
+echo "$as_me:29525: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29589,11 +29590,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29592: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:29593: 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 29596 "configure"
+#line 29597 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29605,25 +29606,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29611: \$? = $ac_status" >&5
+  echo "$as_me:29612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29617: \$? = $ac_status" >&5
+  echo "$as_me:29618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29619: result: yes" >&5
+  echo "$as_me:29620: 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:29626: result: no" >&5
+echo "$as_me:29627: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29638,7 +29639,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29641: error: Cannot link video library" >&5
+	{ { echo "$as_me:29642: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -29648,13 +29649,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang2"'=no'
 	cf_libdir=""
-	echo "$as_me:29651: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:29652: 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 29657 "configure"
+#line 29658 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29685,16 +29686,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29691: \$? = $ac_status" >&5
+  echo "$as_me:29692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29697: \$? = $ac_status" >&5
+  echo "$as_me:29698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -29704,18 +29705,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29707: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:29708: 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:29714: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:29715: 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 29718 "configure"
+#line 29719 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29727,25 +29728,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29730: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29733: \$? = $ac_status" >&5
+  echo "$as_me:29734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29739: \$? = $ac_status" >&5
+  echo "$as_me:29740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29741: result: yes" >&5
+  echo "$as_me:29742: 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:29748: result: no" >&5
+echo "$as_me:29749: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29813,11 +29814,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29816: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:29817: 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 29820 "configure"
+#line 29821 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29829,25 +29830,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29833: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29835: \$? = $ac_status" >&5
+  echo "$as_me:29836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29841: \$? = $ac_status" >&5
+  echo "$as_me:29842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29843: result: yes" >&5
+  echo "$as_me:29844: 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:29850: result: no" >&5
+echo "$as_me:29851: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29862,13 +29863,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang2"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29865: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:29866: 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:29871: checking if we can link slang2 without termcap" >&5
+echo "$as_me:29872: 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%^.%%'`
@@ -29877,7 +29878,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29880 "configure"
+#line 29881 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29889,16 +29890,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29895: \$? = $ac_status" >&5
+  echo "$as_me:29896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29901: \$? = $ac_status" >&5
+  echo "$as_me:29902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -29907,12 +29908,12 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:29910: result: $cf_result" >&5
+echo "$as_me:29911: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:29915: error: cannot find slang headers" >&5
+		{ { echo "$as_me:29916: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29920,14 +29921,14 @@ fi
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:29923: checking if we must define UTF8" >&5
+echo "$as_me:29924: 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 29930 "configure"
+#line 29931 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29939,16 +29940,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29945: \$? = $ac_status" >&5
+  echo "$as_me:29946: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29951: \$? = $ac_status" >&5
+  echo "$as_me:29952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -29956,7 +29957,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29959 "configure"
+#line 29960 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -29970,16 +29971,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29976: \$? = $ac_status" >&5
+  echo "$as_me:29977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29982: \$? = $ac_status" >&5
+  echo "$as_me:29983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -29992,7 +29993,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:29995: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:29996: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -30003,14 +30004,14 @@ EOF
 
 fi
 
-echo "$as_me:30006: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:30007: 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 30013 "configure"
+#line 30014 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -30029,16 +30030,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30035: \$? = $ac_status" >&5
+  echo "$as_me:30036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30041: \$? = $ac_status" >&5
+  echo "$as_me:30042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -30049,20 +30050,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:30052: result: $cf_cv_slang_unix" >&5
+echo "$as_me:30053: 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:30059: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:30060: 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 30065 "configure"
+#line 30066 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30078,16 +30079,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30084: \$? = $ac_status" >&5
+  echo "$as_me:30085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30090: \$? = $ac_status" >&5
+  echo "$as_me:30091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -30097,7 +30098,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30100: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:30101: 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
@@ -30113,13 +30114,13 @@ EOF
 
 fi
 
-	echo "$as_me:30116: checking for SLtt_Char_Type" >&5
+	echo "$as_me:30117: 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 30122 "configure"
+#line 30123 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30135,16 +30136,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30138: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30139: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30141: \$? = $ac_status" >&5
+  echo "$as_me:30142: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30147: \$? = $ac_status" >&5
+  echo "$as_me:30148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -30154,7 +30155,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30157: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:30158: 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
@@ -30177,7 +30178,7 @@ esac
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:30180: checking for an rpath option" >&5
+	echo "$as_me:30181: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -30208,12 +30209,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:30211: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:30212: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:30216: checking if we need a space after rpath option" >&5
+		echo "$as_me:30217: 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"
 
@@ -30234,7 +30235,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 30237 "configure"
+#line 30238 "configure"
 #include "confdefs.h"
 
 int
@@ -30246,16 +30247,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30252: \$? = $ac_status" >&5
+  echo "$as_me:30253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30258: \$? = $ac_status" >&5
+  echo "$as_me:30259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -30265,7 +30266,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:30268: result: $cf_rpath_space" >&5
+		echo "$as_me:30269: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -30276,13 +30277,13 @@ if test -z "$LD_RPATH_OPT"
 then
 	test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30279: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30280: testing will not attempt to use rpath ..." 1>&5
 
 elif test "x${enable_rpath_hack:-yes}" = "xno"
 then
 	test -n "$verbose" && echo "	rpath is disabled" 1>&6
 
-echo "${as_me:-configure}:30285: testing rpath is disabled ..." 1>&5
+echo "${as_me:-configure}:30286: testing rpath is disabled ..." 1>&5
 
 elif test -z "${LD_RUN_PATH}${LD_LIBRARY_PATH}"
 then
@@ -30293,7 +30294,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30296 "configure"
+#line 30297 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -30302,15 +30303,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30308: \$? = $ac_status" >&5
+  echo "$as_me:30309: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30313: \$? = $ac_status" >&5
+  echo "$as_me:30314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30326,7 +30327,7 @@ fi
 		then
 			test -n "$verbose" && echo "	linkage is broken" 1>&6
 
-echo "${as_me:-configure}:30329: testing linkage is broken ..." 1>&5
+echo "${as_me:-configure}:30330: testing linkage is broken ..." 1>&5
 
 			cf_result=
 			for cf_item in $LIBS
@@ -30358,7 +30359,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30361 "configure"
+#line 30362 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -30367,15 +30368,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30373: \$? = $ac_status" >&5
+  echo "$as_me:30374: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30378: \$? = $ac_status" >&5
+  echo "$as_me:30379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30391,12 +30392,12 @@ fi
 				then
 					test -n "$verbose" && echo "	use rpath for $cf_save_LIBS" 1>&6
 
-echo "${as_me:-configure}:30394: testing use rpath for $cf_save_LIBS ..." 1>&5
+echo "${as_me:-configure}:30395: testing use rpath for $cf_save_LIBS ..." 1>&5
 
 					LIBS="$cf_result"
 					test -n "$verbose" && echo "	result is now $LIBS" 1>&6
 
-echo "${as_me:-configure}:30399: testing result is now $LIBS ..." 1>&5
+echo "${as_me:-configure}:30400: testing result is now $LIBS ..." 1>&5
 
 				else
 					LIBS="$cf_save_LIBS"
@@ -30407,20 +30408,20 @@ echo "${as_me:-configure}:30399: testing result is now $LIBS ..." 1>&5
 	(*)
 		test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30410: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30411: testing will not attempt to use rpath ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:30416: checking for chtype typedef" >&5
+echo "$as_me:30417: 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 30423 "configure"
+#line 30424 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30432,16 +30433,16 @@ chtype foo; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30438: \$? = $ac_status" >&5
+  echo "$as_me:30439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30444: \$? = $ac_status" >&5
+  echo "$as_me:30445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -30451,7 +30452,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30454: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:30455: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test "$cf_cv_chtype_decl" = yes ; then
 
@@ -30459,14 +30460,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:30462: checking if chtype is scalar or struct" >&5
+	echo "$as_me:30463: 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 30469 "configure"
+#line 30470 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30478,16 +30479,16 @@ static chtype foo; long x = foo; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30482: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30484: \$? = $ac_status" >&5
+  echo "$as_me:30485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30490: \$? = $ac_status" >&5
+  echo "$as_me:30491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -30497,7 +30498,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30500: result: $cf_cv_chtype_type" >&5
+echo "$as_me:30501: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test "$cf_cv_chtype_type" = scalar ; then
 
@@ -30508,7 +30509,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:30511: checking if you want the wide-curses features" >&5
+echo "$as_me:30512: 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.
@@ -30525,10 +30526,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:30528: result: $use_wide_curses" >&5
+echo "$as_me:30529: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:30531: checking if color-style code should be used" >&5
+echo "$as_me:30532: 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.
@@ -30548,7 +30549,7 @@ fi;
 
 case "$use_color_style" in
 (no)
-	echo "$as_me:30551: result: no" >&5
+	echo "$as_me:30552: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -30558,10 +30559,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:30561: result: yes" >&5
+	echo "$as_me:30562: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:30564: checking for location of style-sheet file" >&5
+	echo "$as_me:30565: 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.
@@ -30597,7 +30598,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30600: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30601: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30606,7 +30607,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:30609: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:30610: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -30619,7 +30620,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:30622: checking for the default configuration-file" >&5
+echo "$as_me:30623: 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.
@@ -30655,7 +30656,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30658: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30659: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30664,7 +30665,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:30667: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:30668: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -30673,7 +30674,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:30676: checking for the default configuration-path" >&5
+echo "$as_me:30677: 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.
@@ -30709,7 +30710,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30712: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30713: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30718,7 +30719,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:30721: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:30722: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && LYNX_CFG_PATH="`echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`"
@@ -30728,7 +30729,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:30731: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:30732: 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.
@@ -30745,7 +30746,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:30748: result: $use_htmlized_cfg" >&5
+echo "$as_me:30749: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -30756,7 +30757,7 @@ else
 	LYNXCFG_NO_MAKE='#'
 fi
 
-echo "$as_me:30759: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:30760: 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.
@@ -30773,7 +30774,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:30776: result: $use_local_docs" >&5
+echo "$as_me:30777: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -30781,7 +30782,7 @@ if test "$use_local_docs" = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:30784: checking for MIME library directory" >&5
+echo "$as_me:30785: 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.
@@ -30817,7 +30818,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30820: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30821: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30826,7 +30827,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:30829: result: $MIME_LIBDIR" >&5
+echo "$as_me:30830: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -30834,7 +30835,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:30837: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:30838: 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.
@@ -30851,7 +30852,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:30854: result: $use_locale_charset" >&5
+echo "$as_me:30855: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test "$use_locale_charset" != no &&
 cat >>confdefs.h <<\EOF
@@ -30860,7 +30861,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:30863: checking if you want only a few charsets" >&5
+echo "$as_me:30864: 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.
@@ -30872,7 +30873,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:30875: result: yes" >&5
+	echo "$as_me:30876: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -30886,7 +30887,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me:-configure}:30889: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:30890: 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'`
@@ -30913,28 +30914,28 @@ echo "${as_me:-configure}:30889: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:30916: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:30917: 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}:30922: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:30923: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:30927: result: no" >&5
+	echo "$as_me:30928: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:30931: checking for ANSI C header files" >&5
+echo "$as_me:30932: 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 30937 "configure"
+#line 30938 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -30942,13 +30943,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:30945: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:30946: \"$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:30951: \$? = $ac_status" >&5
+  echo "$as_me:30952: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30970,7 +30971,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30973 "configure"
+#line 30974 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -30988,7 +30989,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30991 "configure"
+#line 30992 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -31009,7 +31010,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31012 "configure"
+#line 31013 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -31035,15 +31036,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31041: \$? = $ac_status" >&5
+  echo "$as_me:31042: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31046: \$? = $ac_status" >&5
+  echo "$as_me:31047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -31056,7 +31057,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:31059: result: $ac_cv_header_stdc" >&5
+echo "$as_me:31060: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -31066,13 +31067,13 @@ EOF
 
 fi
 
-echo "$as_me:31069: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:31070: 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 31075 "configure"
+#line 31076 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -31088,16 +31089,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31094: \$? = $ac_status" >&5
+  echo "$as_me:31095: \$? = $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:31098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31100: \$? = $ac_status" >&5
+  echo "$as_me:31101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -31107,7 +31108,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31110: result: $ac_cv_header_time" >&5
+echo "$as_me:31111: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -31120,13 +31121,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:31123: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:31124: 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 31129 "configure"
+#line 31130 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -31141,16 +31142,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31147: \$? = $ac_status" >&5
+  echo "$as_me:31148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31153: \$? = $ac_status" >&5
+  echo "$as_me:31154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -31160,7 +31161,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31163: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31164: 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
@@ -31173,7 +31174,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:31176: checking for opendir in -ldir" >&5
+  echo "$as_me:31177: 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
@@ -31181,7 +31182,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31184 "configure"
+#line 31185 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31200,16 +31201,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31206: \$? = $ac_status" >&5
+  echo "$as_me:31207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31212: \$? = $ac_status" >&5
+  echo "$as_me:31213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -31220,14 +31221,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31223: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:31224: 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:31230: checking for opendir in -lx" >&5
+  echo "$as_me:31231: 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
@@ -31235,7 +31236,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31238 "configure"
+#line 31239 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31254,16 +31255,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31260: \$? = $ac_status" >&5
+  echo "$as_me:31261: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31266: \$? = $ac_status" >&5
+  echo "$as_me:31267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -31274,7 +31275,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31277: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:31278: 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"
@@ -31303,23 +31304,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31306: checking for $ac_header" >&5
+echo "$as_me:31307: 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 31312 "configure"
+#line 31313 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31317: \"$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:31322: \$? = $ac_status" >&5
+  echo "$as_me:31323: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31338,7 +31339,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31341: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31342: 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
@@ -31348,14 +31349,14 @@ EOF
 fi
 done
 
-echo "$as_me:31351: checking termio.h and termios.h" >&5
+echo "$as_me:31352: 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 31358 "configure"
+#line 31359 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -31373,16 +31374,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31379: \$? = $ac_status" >&5
+  echo "$as_me:31380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31385: \$? = $ac_status" >&5
+  echo "$as_me:31386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -31393,21 +31394,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31396: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:31397: 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:31403: checking for sigaction and structs" >&5
+echo "$as_me:31404: 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 31410 "configure"
+#line 31411 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31427,16 +31428,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31433: \$? = $ac_status" >&5
+  echo "$as_me:31434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31439: \$? = $ac_status" >&5
+  echo "$as_me:31440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -31447,7 +31448,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:31450: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:31451: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31457,23 +31458,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31460: checking for $ac_header" >&5
+echo "$as_me:31461: 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 31466 "configure"
+#line 31467 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31470: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31471: \"$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:31476: \$? = $ac_status" >&5
+  echo "$as_me:31477: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31492,7 +31493,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31495: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31496: 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
@@ -31513,23 +31514,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31516: checking for $ac_header" >&5
+echo "$as_me:31517: 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 31522 "configure"
+#line 31523 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31526: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31527: \"$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:31532: \$? = $ac_status" >&5
+  echo "$as_me:31533: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31548,7 +31549,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31551: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31552: 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
@@ -31561,23 +31562,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31564: checking for $ac_header" >&5
+echo "$as_me:31565: 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 31570 "configure"
+#line 31571 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31574: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31575: \"$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:31580: \$? = $ac_status" >&5
+  echo "$as_me:31581: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31596,7 +31597,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31599: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31600: 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
@@ -31618,14 +31619,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:31621: checking for union wait" >&5
+echo "$as_me:31622: 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 31628 "configure"
+#line 31629 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31644,16 +31645,16 @@ static int x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31650: \$? = $ac_status" >&5
+  echo "$as_me:31651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31656: \$? = $ac_status" >&5
+  echo "$as_me:31657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -31663,7 +31664,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 31666 "configure"
+#line 31667 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31690,16 +31691,16 @@ union wait x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31694: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31696: \$? = $ac_status" >&5
+  echo "$as_me:31697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31702: \$? = $ac_status" >&5
+  echo "$as_me:31703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -31714,7 +31715,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31717: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:31718: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test "$cf_cv_type_unionwait" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31723,14 +31724,14 @@ EOF
 
 if test "$cf_cv_type_unionwait" = yes; then
 
-	echo "$as_me:31726: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:31727: 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 31733 "configure"
+#line 31734 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31742,16 +31743,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31746: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31748: \$? = $ac_status" >&5
+  echo "$as_me:31749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31754: \$? = $ac_status" >&5
+  echo "$as_me:31755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -31763,21 +31764,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31766: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:31767: 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:31773: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:31774: 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 31780 "configure"
+#line 31781 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31789,16 +31790,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31795: \$? = $ac_status" >&5
+  echo "$as_me:31796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31801: \$? = $ac_status" >&5
+  echo "$as_me:31802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -31810,7 +31811,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31813: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:31814: 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
@@ -31819,13 +31820,13 @@ EOF
 
 fi
 
-echo "$as_me:31822: checking for uid_t in sys/types.h" >&5
+echo "$as_me:31823: 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 31828 "configure"
+#line 31829 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -31839,7 +31840,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:31842: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:31843: 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
 
@@ -31853,7 +31854,7 @@ EOF
 
 fi
 
-echo "$as_me:31856: checking type of array argument to getgroups" >&5
+echo "$as_me:31857: 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
@@ -31862,7 +31863,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31865 "configure"
+#line 31866 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -31888,15 +31889,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31894: \$? = $ac_status" >&5
+  echo "$as_me:31895: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31899: \$? = $ac_status" >&5
+  echo "$as_me:31900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -31909,7 +31910,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >"conftest.$ac_ext" <<_ACEOF
-#line 31912 "configure"
+#line 31913 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -31924,20 +31925,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:31927: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:31928: 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:31934: checking for off_t" >&5
+echo "$as_me:31935: 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 31940 "configure"
+#line 31941 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31952,16 +31953,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31958: \$? = $ac_status" >&5
+  echo "$as_me:31959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31964: \$? = $ac_status" >&5
+  echo "$as_me:31965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -31971,7 +31972,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31974: result: $ac_cv_type_off_t" >&5
+echo "$as_me:31975: 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
   :
@@ -31983,13 +31984,13 @@ EOF
 
 fi
 
-echo "$as_me:31986: checking for pid_t" >&5
+echo "$as_me:31987: 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 31992 "configure"
+#line 31993 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32004,16 +32005,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32007: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32010: \$? = $ac_status" >&5
+  echo "$as_me:32011: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32016: \$? = $ac_status" >&5
+  echo "$as_me:32017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -32023,7 +32024,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32026: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:32027: 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
   :
@@ -32035,13 +32036,13 @@ EOF
 
 fi
 
-echo "$as_me:32038: checking for uid_t in sys/types.h" >&5
+echo "$as_me:32039: 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 32044 "configure"
+#line 32045 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -32055,7 +32056,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:32058: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:32059: 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
 
@@ -32069,13 +32070,13 @@ EOF
 
 fi
 
-echo "$as_me:32072: checking for mode_t" >&5
+echo "$as_me:32073: 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 32078 "configure"
+#line 32079 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32090,16 +32091,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32096: \$? = $ac_status" >&5
+  echo "$as_me:32097: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32102: \$? = $ac_status" >&5
+  echo "$as_me:32103: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -32109,7 +32110,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32112: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:32113: 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
   :
@@ -32121,13 +32122,13 @@ EOF
 
 fi
 
-	echo "$as_me:32124: checking for ssize_t" >&5
+	echo "$as_me:32125: 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 32130 "configure"
+#line 32131 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32142,16 +32143,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32148: \$? = $ac_status" >&5
+  echo "$as_me:32149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32154: \$? = $ac_status" >&5
+  echo "$as_me:32155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -32161,7 +32162,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32164: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:32165: 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
@@ -32177,13 +32178,13 @@ EOF
 
 fi
 
-	echo "$as_me:32180: checking for socklen_t" >&5
+	echo "$as_me:32181: 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 32186 "configure"
+#line 32187 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32201,16 +32202,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32207: \$? = $ac_status" >&5
+  echo "$as_me:32208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32213: \$? = $ac_status" >&5
+  echo "$as_me:32214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -32220,7 +32221,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32223: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:32224: 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
@@ -32236,7 +32237,7 @@ EOF
 
 fi
 
-echo "$as_me:32239: checking for long long type" >&5
+echo "$as_me:32240: 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
@@ -32267,7 +32268,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:32270: result: $cf_cv_type_long_long" >&5
+echo "$as_me:32271: 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
@@ -32278,14 +32279,14 @@ EOF
 
 fi
 
-echo "$as_me:32281: checking for tm.tm_gmtoff" >&5
+echo "$as_me:32282: 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 32288 "configure"
+#line 32289 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -32310,16 +32311,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32316: \$? = $ac_status" >&5
+  echo "$as_me:32317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32322: \$? = $ac_status" >&5
+  echo "$as_me:32323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -32330,20 +32331,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:32333: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:32334: 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:32340: checking for int" >&5
+echo "$as_me:32341: 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 32346 "configure"
+#line 32347 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32358,16 +32359,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32364: \$? = $ac_status" >&5
+  echo "$as_me:32365: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32370: \$? = $ac_status" >&5
+  echo "$as_me:32371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_int=yes
 else
@@ -32377,10 +32378,10 @@ ac_cv_type_int=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32380: result: $ac_cv_type_int" >&5
+echo "$as_me:32381: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:32383: checking size of int" >&5
+echo "$as_me:32384: 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
@@ -32389,7 +32390,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32392 "configure"
+#line 32393 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32401,21 +32402,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32407: \$? = $ac_status" >&5
+  echo "$as_me:32408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32413: \$? = $ac_status" >&5
+  echo "$as_me:32414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32418 "configure"
+#line 32419 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32427,16 +32428,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32433: \$? = $ac_status" >&5
+  echo "$as_me:32434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32439: \$? = $ac_status" >&5
+  echo "$as_me:32440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32452,7 +32453,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32455 "configure"
+#line 32456 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32464,16 +32465,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32470: \$? = $ac_status" >&5
+  echo "$as_me:32471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32476: \$? = $ac_status" >&5
+  echo "$as_me:32477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32489,7 +32490,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 32492 "configure"
+#line 32493 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32501,16 +32502,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32507: \$? = $ac_status" >&5
+  echo "$as_me:32508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32513: \$? = $ac_status" >&5
+  echo "$as_me:32514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32523,12 +32524,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32526: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32527: 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 32531 "configure"
+#line 32532 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32544,15 +32545,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32550: \$? = $ac_status" >&5
+  echo "$as_me:32551: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32555: \$? = $ac_status" >&5
+  echo "$as_me:32556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -32568,7 +32569,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:32571: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:32572: 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
@@ -32577,11 +32578,11 @@ EOF
 if test "${ac_cv_type_int+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_int"
 	if test "${ac_cv_sizeof_int+set}" != set; then
-		{ echo "$as_me:32580: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:32581: 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:32584: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:32585: 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
@@ -32595,13 +32596,13 @@ cf_cv_type=`echo "sizeof_int" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL
 	fi
 fi
 
-echo "$as_me:32598: checking for long" >&5
+echo "$as_me:32599: 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 32604 "configure"
+#line 32605 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32616,16 +32617,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32622: \$? = $ac_status" >&5
+  echo "$as_me:32623: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32628: \$? = $ac_status" >&5
+  echo "$as_me:32629: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_long=yes
 else
@@ -32635,10 +32636,10 @@ ac_cv_type_long=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32638: result: $ac_cv_type_long" >&5
+echo "$as_me:32639: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:32641: checking size of long" >&5
+echo "$as_me:32642: 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
@@ -32647,7 +32648,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32650 "configure"
+#line 32651 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32659,21 +32660,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32665: \$? = $ac_status" >&5
+  echo "$as_me:32666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32671: \$? = $ac_status" >&5
+  echo "$as_me:32672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32676 "configure"
+#line 32677 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32685,16 +32686,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32689: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32691: \$? = $ac_status" >&5
+  echo "$as_me:32692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32697: \$? = $ac_status" >&5
+  echo "$as_me:32698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32710,7 +32711,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32713 "configure"
+#line 32714 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32722,16 +32723,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32726: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32728: \$? = $ac_status" >&5
+  echo "$as_me:32729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32734: \$? = $ac_status" >&5
+  echo "$as_me:32735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32747,7 +32748,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 32750 "configure"
+#line 32751 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32759,16 +32760,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32765: \$? = $ac_status" >&5
+  echo "$as_me:32766: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32771: \$? = $ac_status" >&5
+  echo "$as_me:32772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32781,12 +32782,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32784: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32785: 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 32789 "configure"
+#line 32790 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32802,15 +32803,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32808: \$? = $ac_status" >&5
+  echo "$as_me:32809: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32813: \$? = $ac_status" >&5
+  echo "$as_me:32814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -32826,7 +32827,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:32829: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:32830: 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
@@ -32835,11 +32836,11 @@ EOF
 if test "${ac_cv_type_long+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_long"
 	if test "${ac_cv_sizeof_long+set}" != set; then
-		{ echo "$as_me:32838: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:32839: 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:32842: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:32843: 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
@@ -32853,13 +32854,13 @@ cf_cv_type=`echo "sizeof_long" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK
 	fi
 fi
 
-echo "$as_me:32856: checking for off_t" >&5
+echo "$as_me:32857: 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 32862 "configure"
+#line 32863 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32874,16 +32875,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32880: \$? = $ac_status" >&5
+  echo "$as_me:32881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32886: \$? = $ac_status" >&5
+  echo "$as_me:32887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -32893,10 +32894,10 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32896: result: $ac_cv_type_off_t" >&5
+echo "$as_me:32897: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:32899: checking size of off_t" >&5
+echo "$as_me:32900: 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
@@ -32905,7 +32906,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32908 "configure"
+#line 32909 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32917,21 +32918,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32923: \$? = $ac_status" >&5
+  echo "$as_me:32924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32929: \$? = $ac_status" >&5
+  echo "$as_me:32930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32934 "configure"
+#line 32935 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32943,16 +32944,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32947: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32949: \$? = $ac_status" >&5
+  echo "$as_me:32950: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32955: \$? = $ac_status" >&5
+  echo "$as_me:32956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32968,7 +32969,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32971 "configure"
+#line 32972 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32980,16 +32981,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32986: \$? = $ac_status" >&5
+  echo "$as_me:32987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32992: \$? = $ac_status" >&5
+  echo "$as_me:32993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33005,7 +33006,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33008 "configure"
+#line 33009 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33017,16 +33018,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33023: \$? = $ac_status" >&5
+  echo "$as_me:33024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33029: \$? = $ac_status" >&5
+  echo "$as_me:33030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33039,12 +33040,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33042: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33043: 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 33047 "configure"
+#line 33048 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33060,15 +33061,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33066: \$? = $ac_status" >&5
+  echo "$as_me:33067: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33071: \$? = $ac_status" >&5
+  echo "$as_me:33072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -33084,7 +33085,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:33087: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:33088: 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
@@ -33093,11 +33094,11 @@ EOF
 if test "${ac_cv_type_off_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_off_t"
 	if test "${ac_cv_sizeof_off_t+set}" != set; then
-		{ echo "$as_me:33096: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:33097: 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:33100: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:33101: 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
@@ -33111,13 +33112,13 @@ cf_cv_type=`echo "sizeof_off_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJ
 	fi
 fi
 
-echo "$as_me:33114: checking for size_t" >&5
+echo "$as_me:33115: 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 33120 "configure"
+#line 33121 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33132,16 +33133,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33138: \$? = $ac_status" >&5
+  echo "$as_me:33139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33144: \$? = $ac_status" >&5
+  echo "$as_me:33145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -33151,10 +33152,10 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33154: result: $ac_cv_type_size_t" >&5
+echo "$as_me:33155: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 
-echo "$as_me:33157: checking size of size_t" >&5
+echo "$as_me:33158: checking size of size_t" >&5
 echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -33163,7 +33164,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33166 "configure"
+#line 33167 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33175,21 +33176,21 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33181: \$? = $ac_status" >&5
+  echo "$as_me:33182: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33187: \$? = $ac_status" >&5
+  echo "$as_me:33188: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33192 "configure"
+#line 33193 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33201,16 +33202,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33207: \$? = $ac_status" >&5
+  echo "$as_me:33208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33213: \$? = $ac_status" >&5
+  echo "$as_me:33214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33226,7 +33227,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33229 "configure"
+#line 33230 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33238,16 +33239,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33244: \$? = $ac_status" >&5
+  echo "$as_me:33245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33250: \$? = $ac_status" >&5
+  echo "$as_me:33251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33263,7 +33264,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33266 "configure"
+#line 33267 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33275,16 +33276,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33281: \$? = $ac_status" >&5
+  echo "$as_me:33282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33287: \$? = $ac_status" >&5
+  echo "$as_me:33288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33297,12 +33298,12 @@ done
 ac_cv_sizeof_size_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33300: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33301: 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 33305 "configure"
+#line 33306 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33318,15 +33319,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33324: \$? = $ac_status" >&5
+  echo "$as_me:33325: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33329: \$? = $ac_status" >&5
+  echo "$as_me:33330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
@@ -33342,7 +33343,7 @@ else
   ac_cv_sizeof_size_t=0
 fi
 fi
-echo "$as_me:33345: result: $ac_cv_sizeof_size_t" >&5
+echo "$as_me:33346: result: $ac_cv_sizeof_size_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
@@ -33351,11 +33352,11 @@ EOF
 if test "${ac_cv_type_size_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_size_t"
 	if test "${ac_cv_sizeof_size_t+set}" != set; then
-		{ echo "$as_me:33354: WARNING: using 4 for sizeof size_t" >&5
+		{ echo "$as_me:33355: WARNING: using 4 for sizeof size_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof size_t" >&2;}
 		ac_cv_sizeof_size_t=4
 	elif test "x${ac_cv_sizeof_size_t}" = x0; then
-		{ echo "$as_me:33358: WARNING: sizeof size_t not found, using 4" >&5
+		{ echo "$as_me:33359: WARNING: sizeof size_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof size_t not found, using 4" >&2;}
 		ac_cv_sizeof_size_t=4
 	fi
@@ -33369,13 +33370,13 @@ cf_cv_type=`echo "sizeof_size_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33372: checking for time_t" >&5
+echo "$as_me:33373: 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 33378 "configure"
+#line 33379 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33390,16 +33391,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33396: \$? = $ac_status" >&5
+  echo "$as_me:33397: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33402: \$? = $ac_status" >&5
+  echo "$as_me:33403: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -33409,10 +33410,10 @@ ac_cv_type_time_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33412: result: $ac_cv_type_time_t" >&5
+echo "$as_me:33413: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:33415: checking size of time_t" >&5
+echo "$as_me:33416: 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
@@ -33421,7 +33422,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33424 "configure"
+#line 33425 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33433,21 +33434,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33437: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33439: \$? = $ac_status" >&5
+  echo "$as_me:33440: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33445: \$? = $ac_status" >&5
+  echo "$as_me:33446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33450 "configure"
+#line 33451 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33459,16 +33460,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33463: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33465: \$? = $ac_status" >&5
+  echo "$as_me:33466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33471: \$? = $ac_status" >&5
+  echo "$as_me:33472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33484,7 +33485,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33487 "configure"
+#line 33488 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33496,16 +33497,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33502: \$? = $ac_status" >&5
+  echo "$as_me:33503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33508: \$? = $ac_status" >&5
+  echo "$as_me:33509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33521,7 +33522,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33524 "configure"
+#line 33525 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33533,16 +33534,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33539: \$? = $ac_status" >&5
+  echo "$as_me:33540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33545: \$? = $ac_status" >&5
+  echo "$as_me:33546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33555,12 +33556,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33558: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33559: 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 33563 "configure"
+#line 33564 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33576,15 +33577,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33579: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33580: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33582: \$? = $ac_status" >&5
+  echo "$as_me:33583: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33587: \$? = $ac_status" >&5
+  echo "$as_me:33588: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -33600,7 +33601,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:33603: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:33604: 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
@@ -33609,11 +33610,11 @@ EOF
 if test "${ac_cv_type_time_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_time_t"
 	if test "${ac_cv_sizeof_time_t+set}" != set; then
-		{ echo "$as_me:33612: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:33613: 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:33616: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:33617: 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
@@ -33627,13 +33628,13 @@ cf_cv_type=`echo "sizeof_time_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33630: checking for intptr_t" >&5
+echo "$as_me:33631: 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 33636 "configure"
+#line 33637 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33648,16 +33649,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33654: \$? = $ac_status" >&5
+  echo "$as_me:33655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33660: \$? = $ac_status" >&5
+  echo "$as_me:33661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -33667,7 +33668,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33670: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:33671: 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
   :
@@ -33681,13 +33682,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:33684: checking for working alloca.h" >&5
+echo "$as_me:33685: 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 33690 "configure"
+#line 33691 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -33699,16 +33700,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33705: \$? = $ac_status" >&5
+  echo "$as_me:33706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33711: \$? = $ac_status" >&5
+  echo "$as_me:33712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -33718,7 +33719,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33721: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:33722: 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
 
@@ -33728,13 +33729,13 @@ EOF
 
 fi
 
-echo "$as_me:33731: checking for alloca" >&5
+echo "$as_me:33732: 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 33737 "configure"
+#line 33738 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -33766,16 +33767,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33772: \$? = $ac_status" >&5
+  echo "$as_me:33773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33778: \$? = $ac_status" >&5
+  echo "$as_me:33779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -33785,7 +33786,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33788: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:33789: 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
@@ -33806,13 +33807,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:33809: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:33810: 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 33815 "configure"
+#line 33816 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -33830,18 +33831,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:33833: result: $ac_cv_os_cray" >&5
+echo "$as_me:33834: 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:33838: checking for $ac_func" >&5
+echo "$as_me:33839: 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 33844 "configure"
+#line 33845 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -33872,16 +33873,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33878: \$? = $ac_status" >&5
+  echo "$as_me:33879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33884: \$? = $ac_status" >&5
+  echo "$as_me:33885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -33891,7 +33892,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33894: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:33895: 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
 
@@ -33905,7 +33906,7 @@ fi
   done
 fi
 
-echo "$as_me:33908: checking stack direction for C alloca" >&5
+echo "$as_me:33909: 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
@@ -33914,7 +33915,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33917 "configure"
+#line 33918 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -33937,15 +33938,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33943: \$? = $ac_status" >&5
+  echo "$as_me:33944: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33948: \$? = $ac_status" >&5
+  echo "$as_me:33949: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -33957,7 +33958,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:33960: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:33961: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -33969,23 +33970,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:33972: checking for $ac_header" >&5
+echo "$as_me:33973: 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 33978 "configure"
+#line 33979 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:33982: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:33983: \"$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:33988: \$? = $ac_status" >&5
+  echo "$as_me:33989: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34004,7 +34005,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:34007: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:34008: 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
@@ -34017,13 +34018,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34020: checking for $ac_func" >&5
+echo "$as_me:34021: 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 34026 "configure"
+#line 34027 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34054,16 +34055,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34060: \$? = $ac_status" >&5
+  echo "$as_me:34061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34066: \$? = $ac_status" >&5
+  echo "$as_me:34067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34073,7 +34074,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34076: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34077: 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
@@ -34085,7 +34086,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:34088: checking for working fork" >&5
+  echo "$as_me:34089: 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
@@ -34108,15 +34109,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34114: \$? = $ac_status" >&5
+  echo "$as_me:34115: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34119: \$? = $ac_status" >&5
+  echo "$as_me:34120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -34128,7 +34129,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34131: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:34132: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -34142,12 +34143,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:34145: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34146: 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:34150: checking for working vfork" >&5
+  echo "$as_me:34151: 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
@@ -34156,7 +34157,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34159 "configure"
+#line 34160 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -34253,15 +34254,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34259: \$? = $ac_status" >&5
+  echo "$as_me:34260: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34264: \$? = $ac_status" >&5
+  echo "$as_me:34265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -34273,13 +34274,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34276: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:34277: 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:34282: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34283: 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
 
@@ -34304,14 +34305,14 @@ EOF
 
 fi
 
-echo "$as_me:34307: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:34308: 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 34314 "configure"
+#line 34315 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34328,16 +34329,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34334: \$? = $ac_status" >&5
+  echo "$as_me:34335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34340: \$? = $ac_status" >&5
+  echo "$as_me:34341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -34345,7 +34346,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34348 "configure"
+#line 34349 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34367,16 +34368,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34373: \$? = $ac_status" >&5
+  echo "$as_me:34374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34379: \$? = $ac_status" >&5
+  echo "$as_me:34380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -34389,21 +34390,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:34392: result: $cf_cv_fionbio" >&5
+echo "$as_me:34393: 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:34399: checking for broken/missing definition of remove" >&5
+echo "$as_me:34400: 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 34406 "configure"
+#line 34407 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34415,23 +34416,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34421: \$? = $ac_status" >&5
+  echo "$as_me:34422: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34427: \$? = $ac_status" >&5
+  echo "$as_me:34428: \$? = $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 34434 "configure"
+#line 34435 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -34444,16 +34445,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34450: \$? = $ac_status" >&5
+  echo "$as_me:34451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34456: \$? = $ac_status" >&5
+  echo "$as_me:34457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -34468,21 +34469,21 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34471: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:34472: 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:34478: checking for lstat" >&5
+echo "$as_me:34479: 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 34485 "configure"
+#line 34486 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34496,16 +34497,16 @@ struct stat sb; lstat(".", &sb); (void) sb
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34502: \$? = $ac_status" >&5
+  echo "$as_me:34503: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34508: \$? = $ac_status" >&5
+  echo "$as_me:34509: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -34517,7 +34518,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34520: result: $ac_cv_func_lstat " >&5
+echo "$as_me:34521: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test "$ac_cv_func_lstat" = yes; then
 
@@ -34527,13 +34528,13 @@ EOF
 
 fi
 
-echo "$as_me:34530: checking for vasprintf" >&5
+echo "$as_me:34531: checking for vasprintf" >&5
 echo $ECHO_N "checking for vasprintf... $ECHO_C" >&6
 if test "${ac_cv_func_vasprintf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34536 "configure"
+#line 34537 "configure"
 #include "confdefs.h"
 #define vasprintf autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34564,16 +34565,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34570: \$? = $ac_status" >&5
+  echo "$as_me:34571: \$? = $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:34574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34576: \$? = $ac_status" >&5
+  echo "$as_me:34577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vasprintf=yes
 else
@@ -34583,7 +34584,7 @@ ac_cv_func_vasprintf=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34586: result: $ac_cv_func_vasprintf" >&5
+echo "$as_me:34587: result: $ac_cv_func_vasprintf" >&5
 echo "${ECHO_T}$ac_cv_func_vasprintf" >&6
 if test "$ac_cv_func_vasprintf" = yes; then
 
@@ -34591,10 +34592,10 @@ cat >>confdefs.h <<\EOF
 #define HAVE_VASPRINTF 1
 EOF
 
-	echo "$as_me:34594: checking if vasprintf requires workaround" >&5
+	echo "$as_me:34595: checking if vasprintf requires workaround" >&5
 echo $ECHO_N "checking if vasprintf requires workaround... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 34597 "configure"
+#line 34598 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -34610,19 +34611,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34616: \$? = $ac_status" >&5
+  echo "$as_me:34617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34622: \$? = $ac_status" >&5
+  echo "$as_me:34623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-		echo "$as_me:34625: result: no" >&5
+		echo "$as_me:34626: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
@@ -34630,7 +34631,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 34633 "configure"
+#line 34634 "configure"
 #include "confdefs.h"
 
 			#ifndef _GNU_SOURCE
@@ -34649,19 +34650,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34655: \$? = $ac_status" >&5
+  echo "$as_me:34656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34661: \$? = $ac_status" >&5
+  echo "$as_me:34662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-			echo "$as_me:34664: result: yes" >&5
+			echo "$as_me:34665: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
@@ -34671,7 +34672,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			echo "$as_me:34674: result: unknown" >&5
+			echo "$as_me:34675: result: unknown" >&5
 echo "${ECHO_T}unknown" >&6
 
 fi
@@ -34704,13 +34705,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34707: checking for $ac_func" >&5
+echo "$as_me:34708: 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 34713 "configure"
+#line 34714 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34741,16 +34742,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34747: \$? = $ac_status" >&5
+  echo "$as_me:34748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34753: \$? = $ac_status" >&5
+  echo "$as_me:34754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34760,7 +34761,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34763: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34764: 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
@@ -34774,13 +34775,13 @@ for ac_func in \
 	mkdtemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34777: checking for $ac_func" >&5
+echo "$as_me:34778: 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 34783 "configure"
+#line 34784 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34811,16 +34812,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34817: \$? = $ac_status" >&5
+  echo "$as_me:34818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34823: \$? = $ac_status" >&5
+  echo "$as_me:34824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34830,7 +34831,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34833: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34834: 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
@@ -34842,13 +34843,13 @@ else
 for ac_func in mktemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34845: checking for $ac_func" >&5
+echo "$as_me:34846: 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 34851 "configure"
+#line 34852 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34879,16 +34880,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34885: \$? = $ac_status" >&5
+  echo "$as_me:34886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34891: \$? = $ac_status" >&5
+  echo "$as_me:34892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34898,7 +34899,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34901: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34902: 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
@@ -34918,13 +34919,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34921: checking for $ac_func" >&5
+echo "$as_me:34922: 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 34927 "configure"
+#line 34928 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34955,16 +34956,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34961: \$? = $ac_status" >&5
+  echo "$as_me:34962: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34967: \$? = $ac_status" >&5
+  echo "$as_me:34968: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34974,7 +34975,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34977: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34978: 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
@@ -34986,7 +34987,7 @@ else
 fi
 done
 
-echo "$as_me:34989: checking for random-integer functions" >&5
+echo "$as_me:34990: 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
@@ -35006,7 +35007,7 @@ do
 	esac
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35009 "configure"
+#line 35010 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35025,16 +35026,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func(); (void)seed
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35031: \$? = $ac_status" >&5
+  echo "$as_me:35032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35037: \$? = $ac_status" >&5
+  echo "$as_me:35038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -35046,10 +35047,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:35049: result: $cf_cv_srand_func" >&5
+echo "$as_me:35050: 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:35052: checking for range of random-integers" >&5
+	echo "$as_me:35053: 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
@@ -35070,7 +35071,7 @@ else
 			;;
 		esac
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 35073 "configure"
+#line 35074 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35089,16 +35090,16 @@ long x = $cf_cv_rand_max; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35095: \$? = $ac_status" >&5
+  echo "$as_me:35096: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35101: \$? = $ac_status" >&5
+  echo "$as_me:35102: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -35109,15 +35110,15 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35112: result: $cf_cv_rand_max" >&5
+echo "$as_me:35113: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case "$cf_cv_srand_func" in
 	(*/arc4random)
-		echo "$as_me:35117: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:35118: 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 35120 "configure"
+#line 35121 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35130,23 +35131,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35136: \$? = $ac_status" >&5
+  echo "$as_me:35137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35142: \$? = $ac_status" >&5
+  echo "$as_me:35143: \$? = $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 35149 "configure"
+#line 35150 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35158,16 +35159,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35164: \$? = $ac_status" >&5
+  echo "$as_me:35165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35170: \$? = $ac_status" >&5
+  echo "$as_me:35171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -35178,7 +35179,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	    echo "$as_me:35181: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:35182: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -35188,10 +35189,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:35191: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:35192: 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 35194 "configure"
+#line 35195 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35204,23 +35205,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35210: \$? = $ac_status" >&5
+  echo "$as_me:35211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35216: \$? = $ac_status" >&5
+  echo "$as_me:35217: \$? = $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 35223 "configure"
+#line 35224 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35232,16 +35233,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35238: \$? = $ac_status" >&5
+  echo "$as_me:35239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35244: \$? = $ac_status" >&5
+  echo "$as_me:35245: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=yes
 else
@@ -35252,7 +35253,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-			echo "$as_me:35255: result: $cf_bsd_random_h" >&5
+			echo "$as_me:35256: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -35262,7 +35263,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:35265: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:35266: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -35297,13 +35298,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:35300: checking for $ac_func declaration" >&5
+echo "$as_me:35301: 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 35306 "configure"
+#line 35307 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35324,20 +35325,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35330: \$? = $ac_status" >&5
+  echo "$as_me:35331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35336: \$? = $ac_status" >&5
+  echo "$as_me:35337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35340 "configure"
+#line 35341 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35358,16 +35359,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35364: \$? = $ac_status" >&5
+  echo "$as_me:35365: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35370: \$? = $ac_status" >&5
+  echo "$as_me:35371: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35388,11 +35389,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:35391: result: yes" >&5
+  echo "$as_me:35392: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35395: result: no" >&5
+  echo "$as_me:35396: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35407,13 +35408,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:35410: checking for $ac_func declaration" >&5
+echo "$as_me:35411: 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 35416 "configure"
+#line 35417 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35427,20 +35428,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35433: \$? = $ac_status" >&5
+  echo "$as_me:35434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35439: \$? = $ac_status" >&5
+  echo "$as_me:35440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35443 "configure"
+#line 35444 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35454,16 +35455,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35460: \$? = $ac_status" >&5
+  echo "$as_me:35461: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35466: \$? = $ac_status" >&5
+  echo "$as_me:35467: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35484,11 +35485,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:35487: result: yes" >&5
+  echo "$as_me:35488: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35491: result: no" >&5
+  echo "$as_me:35492: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35503,13 +35504,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:35506: checking for $ac_func declaration" >&5
+echo "$as_me:35507: 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 35512 "configure"
+#line 35513 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35525,20 +35526,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35528: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35531: \$? = $ac_status" >&5
+  echo "$as_me:35532: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35537: \$? = $ac_status" >&5
+  echo "$as_me:35538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35541 "configure"
+#line 35542 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35554,16 +35555,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35558: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35560: \$? = $ac_status" >&5
+  echo "$as_me:35561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35566: \$? = $ac_status" >&5
+  echo "$as_me:35567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35584,11 +35585,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:35587: result: yes" >&5
+  echo "$as_me:35588: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35591: result: no" >&5
+  echo "$as_me:35592: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35600,14 +35601,14 @@ EOF
 fi
 done
 
-echo "$as_me:35603: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:35604: 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 35610 "configure"
+#line 35611 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -35621,16 +35622,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35627: \$? = $ac_status" >&5
+  echo "$as_me:35628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35633: \$? = $ac_status" >&5
+  echo "$as_me:35634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -35641,7 +35642,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:35644: result: $cf_cv_bool_defs" >&5
+echo "$as_me:35645: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -35655,14 +35656,14 @@ EOF
 
 fi
 
-echo "$as_me:35658: checking if external errno is declared" >&5
+echo "$as_me:35659: 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 35665 "configure"
+#line 35666 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35680,16 +35681,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35686: \$? = $ac_status" >&5
+  echo "$as_me:35687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35692: \$? = $ac_status" >&5
+  echo "$as_me:35693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -35700,7 +35701,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35703: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:35704: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -35715,14 +35716,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:35718: checking if external errno exists" >&5
+echo "$as_me:35719: 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 35725 "configure"
+#line 35726 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -35737,16 +35738,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35743: \$? = $ac_status" >&5
+  echo "$as_me:35744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35749: \$? = $ac_status" >&5
+  echo "$as_me:35750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -35757,7 +35758,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35760: result: $cf_cv_have_errno" >&5
+echo "$as_me:35761: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -35770,7 +35771,7 @@ EOF
 
 fi
 
-echo "$as_me:35773: checking if we can set errno" >&5
+echo "$as_me:35774: 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
@@ -35778,7 +35779,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35781 "configure"
+#line 35782 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -35790,16 +35791,16 @@ errno = 255
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35796: \$? = $ac_status" >&5
+  echo "$as_me:35797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35802: \$? = $ac_status" >&5
+  echo "$as_me:35803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -35810,7 +35811,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35813 "configure"
+#line 35814 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -35821,15 +35822,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:35824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35827: \$? = $ac_status" >&5
+  echo "$as_me:35828: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:35829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35832: \$? = $ac_status" >&5
+  echo "$as_me:35833: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=yes
 else
@@ -35842,21 +35843,21 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:35845: result: $cf_cv_set_errno" >&5
+echo "$as_me:35846: 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:35852: checking for setlocale()" >&5
+echo "$as_me:35853: 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 35859 "configure"
+#line 35860 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -35868,16 +35869,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35874: \$? = $ac_status" >&5
+  echo "$as_me:35875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35880: \$? = $ac_status" >&5
+  echo "$as_me:35881: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_locale=yes
 else
@@ -35889,7 +35890,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:35892: result: $cf_cv_locale" >&5
+echo "$as_me:35893: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test "$cf_cv_locale" = yes && {
 cat >>confdefs.h <<\EOF
@@ -35897,14 +35898,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:35900: checking if NGROUPS is defined" >&5
+echo "$as_me:35901: 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 35907 "configure"
+#line 35908 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35923,23 +35924,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35929: \$? = $ac_status" >&5
+  echo "$as_me:35930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35935: \$? = $ac_status" >&5
+  echo "$as_me:35936: \$? = $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 35942 "configure"
+#line 35943 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35958,16 +35959,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35964: \$? = $ac_status" >&5
+  echo "$as_me:35965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35970: \$? = $ac_status" >&5
+  echo "$as_me:35971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -35979,7 +35980,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:35982: result: $cf_cv_ngroups" >&5
+echo "$as_me:35983: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -36000,13 +36001,13 @@ fi
 for ac_func in strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36003: checking for $ac_func" >&5
+echo "$as_me:36004: 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 36009 "configure"
+#line 36010 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -36037,16 +36038,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36043: \$? = $ac_status" >&5
+  echo "$as_me:36044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36049: \$? = $ac_status" >&5
+  echo "$as_me:36050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36056,7 +36057,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:36059: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:36060: 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
@@ -36065,14 +36066,14 @@ EOF
 
 else
 
-echo "$as_me:36068: checking if external sys_nerr is declared" >&5
+echo "$as_me:36069: 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 36075 "configure"
+#line 36076 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36090,16 +36091,16 @@ int x = (int) sys_nerr; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36096: \$? = $ac_status" >&5
+  echo "$as_me:36097: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36102: \$? = $ac_status" >&5
+  echo "$as_me:36103: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -36110,7 +36111,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36113: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:36114: 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
@@ -36125,14 +36126,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36128: checking if external sys_nerr exists" >&5
+echo "$as_me:36129: 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 36135 "configure"
+#line 36136 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -36147,16 +36148,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36150: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36153: \$? = $ac_status" >&5
+  echo "$as_me:36154: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36159: \$? = $ac_status" >&5
+  echo "$as_me:36160: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -36167,7 +36168,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36170: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:36171: 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
@@ -36180,14 +36181,14 @@ EOF
 
 fi
 
-echo "$as_me:36183: checking if external sys_errlist is declared" >&5
+echo "$as_me:36184: 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 36190 "configure"
+#line 36191 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36205,16 +36206,16 @@ int x = (int) sys_errlist; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36209: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36211: \$? = $ac_status" >&5
+  echo "$as_me:36212: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36217: \$? = $ac_status" >&5
+  echo "$as_me:36218: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -36225,7 +36226,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36228: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:36229: 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
@@ -36240,14 +36241,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36243: checking if external sys_errlist exists" >&5
+echo "$as_me:36244: 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 36250 "configure"
+#line 36251 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -36262,16 +36263,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36268: \$? = $ac_status" >&5
+  echo "$as_me:36269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36274: \$? = $ac_status" >&5
+  echo "$as_me:36275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -36282,7 +36283,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36285: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:36286: 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
@@ -36301,23 +36302,23 @@ done
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36304: checking for $ac_header" >&5
+echo "$as_me:36305: 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 36310 "configure"
+#line 36311 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:36315: \"$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:36320: \$? = $ac_status" >&5
+  echo "$as_me:36321: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36336,7 +36337,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:36339: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:36340: 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
@@ -36346,14 +36347,14 @@ EOF
 fi
 done
 
-echo "$as_me:36349: checking for lastlog path" >&5
+echo "$as_me:36350: 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 36356 "configure"
+#line 36357 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36373,16 +36374,16 @@ char *path = _PATH_LASTLOG; (void)path
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36379: \$? = $ac_status" >&5
+  echo "$as_me:36380: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36385: \$? = $ac_status" >&5
+  echo "$as_me:36386: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -36397,14 +36398,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36400: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:36401: 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:36407: checking for utmp implementation" >&5
+echo "$as_me:36408: 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
@@ -36421,7 +36422,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36424 "configure"
+#line 36425 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36437,16 +36438,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36443: \$? = $ac_status" >&5
+  echo "$as_me:36444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36449: \$? = $ac_status" >&5
+  echo "$as_me:36450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36455,7 +36456,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36458 "configure"
+#line 36459 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36471,16 +36472,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36477: \$? = $ac_status" >&5
+  echo "$as_me:36478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36483: \$? = $ac_status" >&5
+  echo "$as_me:36484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36495,7 +36496,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36498: result: $cf_cv_have_utmp" >&5
+echo "$as_me:36499: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -36510,14 +36511,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36513: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:36514: 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 36520 "configure"
+#line 36521 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36534,16 +36535,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36540: \$? = $ac_status" >&5
+  echo "$as_me:36541: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36546: \$? = $ac_status" >&5
+  echo "$as_me:36547: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -36555,7 +36556,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36558: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:36559: 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
@@ -36565,14 +36566,14 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36568: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:36569: 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 36575 "configure"
+#line 36576 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36589,16 +36590,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36593: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36595: \$? = $ac_status" >&5
+  echo "$as_me:36596: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36601: \$? = $ac_status" >&5
+  echo "$as_me:36602: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -36610,7 +36611,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36613: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:36614: 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
@@ -36620,7 +36621,7 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36623: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:36624: 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
@@ -36637,7 +36638,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36640 "configure"
+#line 36641 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36653,16 +36654,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36659: \$? = $ac_status" >&5
+  echo "$as_me:36660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36665: \$? = $ac_status" >&5
+  echo "$as_me:36666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -36674,12 +36675,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36677: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:36678: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case "$cf_cv_have_utmp_ut_name" in
 (no)
-	{ { echo "$as_me:36682: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:36683: 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; }; }
 	;;
@@ -36694,7 +36695,7 @@ esac
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36697: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:36698: 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
@@ -36707,7 +36708,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36710 "configure"
+#line 36711 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36724,16 +36725,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36730: \$? = $ac_status" >&5
+  echo "$as_me:36731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36736: \$? = $ac_status" >&5
+  echo "$as_me:36737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -36746,7 +36747,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36749: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:36750: 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
 
@@ -36762,14 +36763,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36765: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:36766: 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 36772 "configure"
+#line 36773 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36786,23 +36787,23 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36792: \$? = $ac_status" >&5
+  echo "$as_me:36793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36798: \$? = $ac_status" >&5
+  echo "$as_me:36799: \$? = $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 36805 "configure"
+#line 36806 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36819,16 +36820,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36825: \$? = $ac_status" >&5
+  echo "$as_me:36826: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36831: \$? = $ac_status" >&5
+  echo "$as_me:36832: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -36842,7 +36843,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36845: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:36846: 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
 
@@ -36861,14 +36862,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36864: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:36865: 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 36871 "configure"
+#line 36872 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36885,16 +36886,16 @@ static struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36891: \$? = $ac_status" >&5
+  echo "$as_me:36892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36897: \$? = $ac_status" >&5
+  echo "$as_me:36898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -36905,7 +36906,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36908: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:36909: 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
 
@@ -36916,7 +36917,7 @@ EOF
 fi
 fi
 
-echo "$as_me:36919: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:36920: 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
@@ -36924,7 +36925,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36927 "configure"
+#line 36928 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36943,16 +36944,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36947: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36949: \$? = $ac_status" >&5
+  echo "$as_me:36950: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36955: \$? = $ac_status" >&5
+  echo "$as_me:36956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -36963,7 +36964,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36966: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:36967: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -36972,14 +36973,14 @@ EOF
 
 fi
 
-echo "$as_me:36975: checking if external h_errno exists" >&5
+echo "$as_me:36976: 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 36982 "configure"
+#line 36983 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -36994,16 +36995,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37000: \$? = $ac_status" >&5
+  echo "$as_me:37001: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37006: \$? = $ac_status" >&5
+  echo "$as_me:37007: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -37014,7 +37015,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37017: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:37018: 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
@@ -37027,7 +37028,7 @@ EOF
 
 fi
 
-echo "$as_me:37030: checking if bibp: URLs should be supported" >&5
+echo "$as_me:37031: 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.
@@ -37044,14 +37045,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:37047: result: $use_bibp_urls" >&5
+echo "$as_me:37048: 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:37054: checking if configuration info should be browsable" >&5
+echo "$as_me:37055: 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.
@@ -37068,14 +37069,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:37071: result: $use_config_info" >&5
+echo "$as_me:37072: 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:37078: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:37079: 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.
@@ -37092,14 +37093,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:37095: result: $use_forms_options" >&5
+echo "$as_me:37096: 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:37102: checking if old-style options menu should be used" >&5
+echo "$as_me:37103: 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.
@@ -37116,14 +37117,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:37119: result: $use_menu_options" >&5
+echo "$as_me:37120: 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:37126: checking if sessions code should be used" >&5
+echo "$as_me:37127: 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.
@@ -37140,7 +37141,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:37143: result: $use_sessions" >&5
+echo "$as_me:37144: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test "$use_sessions" != no ; then
 
@@ -37151,7 +37152,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:37154: checking if session-caching code should be used" >&5
+echo "$as_me:37155: 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.
@@ -37168,7 +37169,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:37171: result: $use_session_cache" >&5
+echo "$as_me:37172: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test "$use_session_cache" != no ; then
 
@@ -37178,7 +37179,7 @@ EOF
 
 fi
 
-echo "$as_me:37181: checking if address-list page should be used" >&5
+echo "$as_me:37182: 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.
@@ -37195,14 +37196,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:37198: result: $use_addrlist_page" >&5
+echo "$as_me:37199: 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:37205: checking if support for CJK should be used" >&5
+echo "$as_me:37206: checking if support for CJK should be used" >&5
 echo $ECHO_N "checking if support for CJK should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -37219,7 +37220,7 @@ else
 	use_cjk=yes
 
 fi;
-echo "$as_me:37222: result: $use_cjk" >&5
+echo "$as_me:37223: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test "$use_cjk" != no &&
 cat >>confdefs.h <<\EOF
@@ -37269,7 +37270,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37272 "configure"
+#line 37273 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37281,16 +37282,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37285: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37287: \$? = $ac_status" >&5
+  echo "$as_me:37288: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37293: \$? = $ac_status" >&5
+  echo "$as_me:37294: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37307,7 +37308,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:37310: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37311: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37353,7 +37354,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37356 "configure"
+#line 37357 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37365,16 +37366,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37371: \$? = $ac_status" >&5
+  echo "$as_me:37372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37377: \$? = $ac_status" >&5
+  echo "$as_me:37378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37391,7 +37392,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:37394: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37395: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37409,7 +37410,7 @@ echo "${as_me:-configure}:37394: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:37412: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37413: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37434,7 +37435,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:37437: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37438: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37463,7 +37464,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:37466: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37467: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37472,7 +37473,7 @@ echo "${as_me:-configure}:37466: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:37475: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37476: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37483,7 +37484,7 @@ esac
 
 fi;
 
-  echo "$as_me:37486: checking for iconv" >&5
+  echo "$as_me:37487: 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
@@ -37494,12 +37495,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:37497: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37498: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37502 "configure"
+#line 37503 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37518,16 +37519,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37524: \$? = $ac_status" >&5
+  echo "$as_me:37525: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37530: \$? = $ac_status" >&5
+  echo "$as_me:37531: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37541,7 +37542,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37544 "configure"
+#line 37545 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37560,16 +37561,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37566: \$? = $ac_status" >&5
+  echo "$as_me:37567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37572: \$? = $ac_status" >&5
+  echo "$as_me:37573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37586,9 +37587,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:37589: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:37590: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:37591: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37592: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37679,7 +37680,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_iconv" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:37682: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37683: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -37687,7 +37688,7 @@ echo "${as_me:-configure}:37682: testing ... testing $cf_cv_header_path_iconv ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 37690 "configure"
+#line 37691 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37706,21 +37707,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37712: \$? = $ac_status" >&5
+  echo "$as_me:37713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37718: \$? = $ac_status" >&5
+  echo "$as_me:37719: \$? = $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}:37723: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37724: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37738,7 +37739,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:37741: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37742: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -37813,13 +37814,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_iconv" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me:-configure}:37816: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37817: 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 37822 "configure"
+#line 37823 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37838,21 +37839,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37844: \$? = $ac_status" >&5
+  echo "$as_me:37845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37850: \$? = $ac_status" >&5
+  echo "$as_me:37851: \$? = $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}:37855: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37856: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -37892,7 +37893,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:37895: result: $am_cv_func_iconv" >&5
+echo "$as_me:37896: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -37901,14 +37902,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:37904: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:37905: 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 37911 "configure"
+#line 37912 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37933,16 +37934,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37939: \$? = $ac_status" >&5
+  echo "$as_me:37940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37945: \$? = $ac_status" >&5
+  echo "$as_me:37946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -37952,7 +37953,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:37955: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:37956: 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
@@ -37997,7 +37998,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38000 "configure"
+#line 38001 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38009,16 +38010,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38015: \$? = $ac_status" >&5
+  echo "$as_me:38016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38021: \$? = $ac_status" >&5
+  echo "$as_me:38022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38035,7 +38036,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:38038: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38039: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38074,7 +38075,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:38077: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38078: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38088,7 +38089,7 @@ fi
 if test "x$am_cv_func_iconv" = "xyes"
 then
 
-echo "$as_me:38091: checking if experimental support for Chinese UTF-8 should be used" >&5
+echo "$as_me:38092: checking if experimental support for Chinese UTF-8 should be used" >&5
 echo $ECHO_N "checking if experimental support for Chinese UTF-8 should be used... $ECHO_C" >&6
 
 # Check whether --enable-chinese-utf8 or --disable-chinese-utf8 was given.
@@ -38105,7 +38106,7 @@ else
 	use_cn_utf8=yes
 
 fi;
-echo "$as_me:38108: result: $use_cn_utf8" >&5
+echo "$as_me:38109: result: $use_cn_utf8" >&5
 echo "${ECHO_T}$use_cn_utf8" >&6
 if test "$use_cn_utf8" != no ; then
 
@@ -38116,7 +38117,7 @@ EOF
 	use_cjk_utf8=yes
 fi
 
-echo "$as_me:38119: checking if support for Japanese UTF-8 should be used" >&5
+echo "$as_me:38120: checking if support for Japanese UTF-8 should be used" >&5
 echo $ECHO_N "checking if support for Japanese UTF-8 should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -38133,7 +38134,7 @@ else
 	use_ja_utf8=yes
 
 fi;
-echo "$as_me:38136: result: $use_ja_utf8" >&5
+echo "$as_me:38137: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test "$use_ja_utf8" != no ; then
 
@@ -38154,11 +38155,11 @@ fi
 else
 	test -n "$verbose" && echo "	skipping CJK features which depend on iconv" 1>&6
 
-echo "${as_me:-configure}:38157: testing skipping CJK features which depend on iconv ..." 1>&5
+echo "${as_me:-configure}:38158: testing skipping CJK features which depend on iconv ..." 1>&5
 
 fi
 
-echo "$as_me:38161: checking if experimental wcwidth/UTF-8 logic should be used" >&5
+echo "$as_me:38162: checking if experimental wcwidth/UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental wcwidth/UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-wcwidth-support or --disable-wcwidth-support was given.
@@ -38175,7 +38176,7 @@ else
 	use_wcwidth=no
 
 fi;
-echo "$as_me:38178: result: $use_wcwidth" >&5
+echo "$as_me:38179: result: $use_wcwidth" >&5
 echo "${ECHO_T}$use_wcwidth" >&6
 test "$use_wcwidth" != no &&
 cat >>confdefs.h <<\EOF
@@ -38190,7 +38191,7 @@ case "$cf_cv_screen" in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:38193: checking if you want to use default-colors" >&5
+echo "$as_me:38194: 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.
@@ -38207,7 +38208,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:38210: result: $use_dft_colors" >&5
+echo "$as_me:38211: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test "$use_dft_colors" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -38216,7 +38217,7 @@ EOF
 
 fi
 
-echo "$as_me:38219: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:38220: 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.
@@ -38233,14 +38234,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:38236: result: $use_kbd_layout" >&5
+echo "$as_me:38237: 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:38243: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:38244: 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.
@@ -38257,14 +38258,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:38260: result: $use_nested_tables" >&5
+echo "$as_me:38261: 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:38267: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:38268: 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.
@@ -38281,14 +38282,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:38284: result: $use_alt_bindings" >&5
+echo "$as_me:38285: 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:38291: checking if ascii case-conversion should be used" >&5
+echo "$as_me:38292: 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.
@@ -38305,14 +38306,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:38308: result: $use_ascii_ctypes" >&5
+echo "$as_me:38309: 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:38315: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:38316: 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.
@@ -38329,14 +38330,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:38332: result: $use_ext_htmldtd" >&5
+echo "$as_me:38333: 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:38339: checking if file-upload logic should be used" >&5
+echo "$as_me:38340: 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.
@@ -38353,14 +38354,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:38356: result: $use_file_upload" >&5
+echo "$as_me:38357: 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:38363: checking if IDNA support should be used" >&5
+echo "$as_me:38364: 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.
@@ -38377,7 +38378,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:38380: result: $use_idna" >&5
+echo "$as_me:38381: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -38419,7 +38420,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38422 "configure"
+#line 38423 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38431,16 +38432,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38435: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38437: \$? = $ac_status" >&5
+  echo "$as_me:38438: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38443: \$? = $ac_status" >&5
+  echo "$as_me:38444: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38457,7 +38458,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:38460: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38461: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38503,7 +38504,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38506 "configure"
+#line 38507 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38515,16 +38516,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38518: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38521: \$? = $ac_status" >&5
+  echo "$as_me:38522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38527: \$? = $ac_status" >&5
+  echo "$as_me:38528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38541,7 +38542,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:38544: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38545: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38559,7 +38560,7 @@ echo "${as_me:-configure}:38544: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:38562: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38563: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38584,7 +38585,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:38587: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38588: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38613,7 +38614,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:38616: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38617: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38622,7 +38623,7 @@ echo "${as_me:-configure}:38616: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:38625: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38626: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38636,12 +38637,12 @@ esac
 cf_cv_header_path_idn2=
 cf_cv_library_path_idn2=
 
-echo "${as_me:-configure}:38639: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38640: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38644 "configure"
+#line 38645 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38660,16 +38661,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38666: \$? = $ac_status" >&5
+  echo "$as_me:38667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38672: \$? = $ac_status" >&5
+  echo "$as_me:38673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38683,7 +38684,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38686 "configure"
+#line 38687 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38702,16 +38703,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38708: \$? = $ac_status" >&5
+  echo "$as_me:38709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38714: \$? = $ac_status" >&5
+  echo "$as_me:38715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38728,9 +38729,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn2 library" 1>&6
 
-echo "${as_me:-configure}:38731: testing find linkage for idn2 library ..." 1>&5
+echo "${as_me:-configure}:38732: testing find linkage for idn2 library ..." 1>&5
 
-echo "${as_me:-configure}:38733: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38734: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38821,7 +38822,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_idn2" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38824: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38825: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -38829,7 +38830,7 @@ echo "${as_me:-configure}:38824: testing ... testing $cf_cv_header_path_idn2 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 38832 "configure"
+#line 38833 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38848,21 +38849,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38854: \$? = $ac_status" >&5
+  echo "$as_me:38855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38860: \$? = $ac_status" >&5
+  echo "$as_me:38861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				test -n "$verbose" && echo "	... found idn2 headers in $cf_cv_header_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38865: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38866: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
 
 				cf_cv_find_linkage_idn2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38880,7 +38881,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn2" = maybe ; then
 
-echo "${as_me:-configure}:38883: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38884: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -38955,13 +38956,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_idn2" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38958: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38959: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn2"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 38964 "configure"
+#line 38965 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38980,21 +38981,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38986: \$? = $ac_status" >&5
+  echo "$as_me:38987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38992: \$? = $ac_status" >&5
+  echo "$as_me:38993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 					test -n "$verbose" && echo "	... found idn2 library in $cf_cv_library_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38997: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38998: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
 
 					cf_cv_find_linkage_idn2=yes
 					cf_cv_library_file_idn2="-lidn2"
@@ -39056,7 +39057,7 @@ if test -n "$cf_cv_header_path_idn2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39059 "configure"
+#line 39060 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39068,16 +39069,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39074: \$? = $ac_status" >&5
+  echo "$as_me:39075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39080: \$? = $ac_status" >&5
+  echo "$as_me:39081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39094,7 +39095,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:39097: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39098: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39130,7 +39131,7 @@ if test -n "$cf_cv_library_path_idn2" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:39133: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39134: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39157,14 +39158,14 @@ LIBS="$cf_add_libs"
 else
 test -n "$verbose" && echo "	unsuccessful, will try idn (older)" 1>&6
 
-echo "${as_me:-configure}:39160: testing unsuccessful, will try idn (older) ..." 1>&5
+echo "${as_me:-configure}:39161: testing unsuccessful, will try idn (older) ..." 1>&5
 
 fi
 
 if test "x$cf_cv_find_linkage_idn2" = xyes ; then
 	test -n "$verbose" && echo "	found idn2 library" 1>&6
 
-echo "${as_me:-configure}:39167: testing found idn2 library ..." 1>&5
+echo "${as_me:-configure}:39168: testing found idn2 library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDN2 1
@@ -39177,12 +39178,12 @@ else
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:39180: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39181: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39185 "configure"
+#line 39186 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39201,16 +39202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39207: \$? = $ac_status" >&5
+  echo "$as_me:39208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39213: \$? = $ac_status" >&5
+  echo "$as_me:39214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39224,7 +39225,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39227 "configure"
+#line 39228 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39243,16 +39244,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39249: \$? = $ac_status" >&5
+  echo "$as_me:39250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39255: \$? = $ac_status" >&5
+  echo "$as_me:39256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39269,9 +39270,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:39272: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:39273: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:39274: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39275: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39362,7 +39363,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_idn" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:39365: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39366: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -39370,7 +39371,7 @@ echo "${as_me:-configure}:39365: testing ... testing $cf_cv_header_path_idn ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 39373 "configure"
+#line 39374 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39389,21 +39390,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39393: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39395: \$? = $ac_status" >&5
+  echo "$as_me:39396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39401: \$? = $ac_status" >&5
+  echo "$as_me:39402: \$? = $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}:39406: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39407: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39421,7 +39422,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:39424: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39425: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39496,13 +39497,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_idn" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:39499: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39500: 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 39505 "configure"
+#line 39506 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39521,21 +39522,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39527: \$? = $ac_status" >&5
+  echo "$as_me:39528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39533: \$? = $ac_status" >&5
+  echo "$as_me:39534: \$? = $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}:39538: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39539: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -39597,7 +39598,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39600 "configure"
+#line 39601 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39609,16 +39610,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39615: \$? = $ac_status" >&5
+  echo "$as_me:39616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39621: \$? = $ac_status" >&5
+  echo "$as_me:39622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39635,7 +39636,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:39638: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39639: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39671,7 +39672,7 @@ if test -n "$cf_cv_library_path_idn" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:39674: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39675: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39696,14 +39697,14 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:39699: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:39700: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
 if test "x$cf_cv_find_linkage_idn" = xyes ; then
 	test -n "$verbose" && echo "	found idn library" 1>&6
 
-echo "${as_me:-configure}:39706: testing found idn library ..." 1>&5
+echo "${as_me:-configure}:39707: testing found idn library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDNA 1
@@ -39714,7 +39715,7 @@ fi
 
 fi
 
-echo "$as_me:39717: checking if element-justification logic should be used" >&5
+echo "$as_me:39718: 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.
@@ -39731,14 +39732,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:39734: result: $use_justify_elts" >&5
+echo "$as_me:39735: 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:39741: checking if partial-display should be used" >&5
+echo "$as_me:39742: 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.
@@ -39755,14 +39756,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:39758: result: $use_partial_display" >&5
+echo "$as_me:39759: 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:39765: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:39766: 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.
@@ -39779,14 +39780,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:39782: result: $use_filed_cookies" >&5
+echo "$as_me:39783: 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:39789: checking if html source should be colorized" >&5
+echo "$as_me:39790: 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.
@@ -39803,14 +39804,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:39806: result: $use_prettysrc" >&5
+echo "$as_me:39807: 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:39813: checking if progress-bar code should be used" >&5
+echo "$as_me:39814: 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.
@@ -39827,14 +39828,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:39830: result: $use_progressbar" >&5
+echo "$as_me:39831: 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:39837: checking if read-progress message should show ETA" >&5
+echo "$as_me:39838: 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.
@@ -39851,14 +39852,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:39854: result: $use_read_eta" >&5
+echo "$as_me:39855: 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:39861: checking if source caching should be used" >&5
+echo "$as_me:39862: 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.
@@ -39875,14 +39876,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:39878: result: $use_source_cache" >&5
+echo "$as_me:39879: 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:39885: checking if scrollbar code should be used" >&5
+echo "$as_me:39886: 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.
@@ -39899,10 +39900,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:39902: result: $use_scrollbar" >&5
+echo "$as_me:39903: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:39905: checking if charset-selection logic should be used" >&5
+echo "$as_me:39906: 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.
@@ -39919,14 +39920,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:39922: result: $use_charset_choice" >&5
+echo "$as_me:39923: 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:39929: checking if you want to use external commands" >&5
+echo "$as_me:39930: 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.
@@ -39943,7 +39944,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:39946: result: $use_externs" >&5
+echo "$as_me:39947: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test "$use_externs" != "no" ; then
 
@@ -39954,7 +39955,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:39957: checking if you want to use setfont support" >&5
+echo "$as_me:39958: 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.
@@ -39971,7 +39972,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:39974: result: $use_setfont" >&5
+echo "$as_me:39975: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test "$use_setfont" = yes ; then
 	case "$host_os" in
@@ -39982,7 +39983,7 @@ for ac_prog in $SETFONT consolechars setfont
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:39985: checking for $ac_word" >&5
+echo "$as_me:39986: 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
@@ -39999,7 +40000,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_SETFONT="$ac_dir/$ac_word"
-   echo "$as_me:40002: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40003: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -40010,10 +40011,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:40013: result: $SETFONT" >&5
+  echo "$as_me:40014: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:40016: result: no" >&5
+  echo "$as_me:40017: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40072,7 +40073,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:40075: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40076: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -40090,19 +40091,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:40093: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:40094: 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}:40100: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:40101: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:40105: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:40106: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -40113,7 +40114,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:40116: checking if you want cgi-link support" >&5
+echo "$as_me:40117: 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.
@@ -40130,10 +40131,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:40133: result: $enableval" >&5
+echo "$as_me:40134: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:40136: checking if you want change-exec support" >&5
+echo "$as_me:40137: 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.
@@ -40150,14 +40151,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:40153: result: $use_change_exec" >&5
+echo "$as_me:40154: 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:40160: checking if you want exec-links support" >&5
+echo "$as_me:40161: 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.
@@ -40174,14 +40175,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:40177: result: $use_exec_links" >&5
+echo "$as_me:40178: 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:40184: checking if you want exec-scripts support" >&5
+echo "$as_me:40185: 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.
@@ -40198,14 +40199,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:40201: result: $use_exec_scripts" >&5
+echo "$as_me:40202: 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:40208: checking if you want internal-links feature" >&5
+echo "$as_me:40209: 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.
@@ -40222,14 +40223,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:40225: result: $use_internal_links" >&5
+echo "$as_me:40226: 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:40232: checking if you want to fork NSL requests" >&5
+echo "$as_me:40233: 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.
@@ -40246,7 +40247,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:40249: result: $use_nsl_fork" >&5
+echo "$as_me:40250: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test "$use_nsl_fork" = yes ; then
 	case "$host_os" in
@@ -40267,7 +40268,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:40270: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:40271: 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.
@@ -40284,14 +40285,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:40287: result: $use_syslog" >&5
+echo "$as_me:40288: 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:40294: checking if you want to underline links" >&5
+echo "$as_me:40295: 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.
@@ -40308,7 +40309,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:40311: result: $use_underline" >&5
+echo "$as_me:40312: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test "$use_underline" = yes &&
 cat >>confdefs.h <<\EOF
@@ -40320,7 +40321,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:40323: checking if help files should be gzip'ed" >&5
+echo "$as_me:40324: 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.
@@ -40337,10 +40338,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:40340: result: $use_gzip_help" >&5
+echo "$as_me:40341: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:40343: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:40344: 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.
@@ -40350,7 +40351,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:40353: result: $use_bzlib" >&5
+echo "$as_me:40354: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -40392,7 +40393,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40395 "configure"
+#line 40396 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40404,16 +40405,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40407: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40410: \$? = $ac_status" >&5
+  echo "$as_me:40411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40416: \$? = $ac_status" >&5
+  echo "$as_me:40417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40430,7 +40431,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:40433: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40434: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40476,7 +40477,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40479 "configure"
+#line 40480 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40488,16 +40489,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40494: \$? = $ac_status" >&5
+  echo "$as_me:40495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40500: \$? = $ac_status" >&5
+  echo "$as_me:40501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40514,7 +40515,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:40517: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40518: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40532,7 +40533,7 @@ echo "${as_me:-configure}:40517: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:40535: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40536: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40557,7 +40558,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:40560: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40561: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40586,7 +40587,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:40589: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40590: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40595,7 +40596,7 @@ echo "${as_me:-configure}:40589: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:40598: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40599: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40609,12 +40610,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:40612: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40613: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40617 "configure"
+#line 40618 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40631,16 +40632,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40637: \$? = $ac_status" >&5
+  echo "$as_me:40638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40643: \$? = $ac_status" >&5
+  echo "$as_me:40644: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40654,7 +40655,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40657 "configure"
+#line 40658 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40671,16 +40672,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40677: \$? = $ac_status" >&5
+  echo "$as_me:40678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40683: \$? = $ac_status" >&5
+  echo "$as_me:40684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40697,9 +40698,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:40700: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:40701: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:40702: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40703: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40790,7 +40791,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_bz2" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:40793: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40794: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -40798,7 +40799,7 @@ echo "${as_me:-configure}:40793: testing ... testing $cf_cv_header_path_bz2 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 40801 "configure"
+#line 40802 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40815,21 +40816,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40821: \$? = $ac_status" >&5
+  echo "$as_me:40822: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40827: \$? = $ac_status" >&5
+  echo "$as_me:40828: \$? = $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}:40832: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40833: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40847,7 +40848,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:40850: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40851: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -40855,7 +40856,7 @@ echo "${as_me:-configure}:40850: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 40858 "configure"
+#line 40859 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40872,21 +40873,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40878: \$? = $ac_status" >&5
+  echo "$as_me:40879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40884: \$? = $ac_status" >&5
+  echo "$as_me:40885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:40889: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:40890: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -40967,13 +40968,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_bz2" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me:-configure}:40970: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40971: 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 40976 "configure"
+#line 40977 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40990,21 +40991,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40996: \$? = $ac_status" >&5
+  echo "$as_me:40997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41002: \$? = $ac_status" >&5
+  echo "$as_me:41003: \$? = $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}:41007: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41008: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -41066,7 +41067,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41069 "configure"
+#line 41070 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41078,16 +41079,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41084: \$? = $ac_status" >&5
+  echo "$as_me:41085: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41090: \$? = $ac_status" >&5
+  echo "$as_me:41091: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41104,7 +41105,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:41107: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41108: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41140,7 +41141,7 @@ if test -n "$cf_cv_library_path_bz2" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:41143: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41144: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41165,7 +41166,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:41168: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:41169: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -41176,7 +41177,7 @@ EOF
 
 fi
 
-echo "$as_me:41179: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:41180: 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.
@@ -41186,7 +41187,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:41189: result: $use_zlib" >&5
+echo "$as_me:41190: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -41228,7 +41229,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41231 "configure"
+#line 41232 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41240,16 +41241,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41246: \$? = $ac_status" >&5
+  echo "$as_me:41247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41252: \$? = $ac_status" >&5
+  echo "$as_me:41253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41266,7 +41267,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:41269: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41270: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41312,7 +41313,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41315 "configure"
+#line 41316 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41324,16 +41325,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41330: \$? = $ac_status" >&5
+  echo "$as_me:41331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41336: \$? = $ac_status" >&5
+  echo "$as_me:41337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41350,7 +41351,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:41353: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41354: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41368,7 +41369,7 @@ echo "${as_me:-configure}:41353: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:41371: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41372: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41393,7 +41394,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:41396: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41397: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41422,7 +41423,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:41425: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41426: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41431,7 +41432,7 @@ echo "${as_me:-configure}:41425: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:41434: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41435: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41445,12 +41446,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:41448: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41449: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41453 "configure"
+#line 41454 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41466,16 +41467,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41472: \$? = $ac_status" >&5
+  echo "$as_me:41473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41478: \$? = $ac_status" >&5
+  echo "$as_me:41479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41489,7 +41490,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41492 "configure"
+#line 41493 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41505,16 +41506,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41511: \$? = $ac_status" >&5
+  echo "$as_me:41512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41517: \$? = $ac_status" >&5
+  echo "$as_me:41518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41531,9 +41532,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:41534: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:41535: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:41536: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41537: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41624,7 +41625,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_z" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:41627: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41628: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -41632,7 +41633,7 @@ echo "${as_me:-configure}:41627: testing ... testing $cf_cv_header_path_z ..." 1
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 41635 "configure"
+#line 41636 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41648,21 +41649,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41654: \$? = $ac_status" >&5
+  echo "$as_me:41655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41660: \$? = $ac_status" >&5
+  echo "$as_me:41661: \$? = $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}:41665: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41666: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41680,7 +41681,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:41683: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41684: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -41688,7 +41689,7 @@ echo "${as_me:-configure}:41683: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 41691 "configure"
+#line 41692 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41704,21 +41705,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41710: \$? = $ac_status" >&5
+  echo "$as_me:41711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41716: \$? = $ac_status" >&5
+  echo "$as_me:41717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:41721: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:41722: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -41799,13 +41800,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_z" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_z" 1>&6
 
-echo "${as_me:-configure}:41802: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41803: 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 41808 "configure"
+#line 41809 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41821,21 +41822,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41827: \$? = $ac_status" >&5
+  echo "$as_me:41828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41833: \$? = $ac_status" >&5
+  echo "$as_me:41834: \$? = $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}:41838: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41839: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -41897,7 +41898,7 @@ if test -n "$cf_cv_header_path_z" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41900 "configure"
+#line 41901 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41909,16 +41910,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41915: \$? = $ac_status" >&5
+  echo "$as_me:41916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41921: \$? = $ac_status" >&5
+  echo "$as_me:41922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41935,7 +41936,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:41938: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41939: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41971,7 +41972,7 @@ if test -n "$cf_cv_library_path_z" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:41974: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41975: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41996,7 +41997,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:41999: WARNING: Cannot find z library" >&5
+{ echo "$as_me:42000: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -42005,13 +42006,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:42008: checking for $ac_func" >&5
+echo "$as_me:42009: 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 42014 "configure"
+#line 42015 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -42042,16 +42043,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42048: \$? = $ac_status" >&5
+  echo "$as_me:42049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42054: \$? = $ac_status" >&5
+  echo "$as_me:42055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -42061,7 +42062,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42064: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:42065: 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
@@ -42078,7 +42079,873 @@ EOF
 
 fi
 
-echo "$as_me:42081: checking if you want to exclude FINGER code" >&5
+echo "$as_me:42082: checking if you want to use brotli decompression" >&5
+echo $ECHO_N "checking if you want to use brotli decompression... $ECHO_C" >&6
+
+# Check whether --with-brotli or --without-brotli was given.
+if test "${with_brotli+set}" = set; then
+  withval="$with_brotli"
+  use_brotli=$withval
+else
+  use_brotli=no
+fi;
+echo "$as_me:42092: result: $use_brotli" >&5
+echo "${ECHO_T}$use_brotli" >&6
+
+if test ".$use_brotli" != ".no" ; then
+
+case "$use_brotli" in
+(no)
+	;;
+(yes)
+	;;
+(*)
+
+for cf_searchpath in `echo "$use_brotli" | tr $PATH_SEPARATOR ' '`; do
+	if test -d "$cf_searchpath/include" ; then
+
+if test -n "$cf_searchpath/include" ; then
+  for cf_add_incdir in $cf_searchpath/include
+  do
+	while test "$cf_add_incdir" != /usr/include
+	do
+	  if test -d "$cf_add_incdir"
+	  then
+		cf_have_incdir=no
+		if test -n "$CFLAGS$CPPFLAGS" ; then
+		  # a loop is needed to ensure we can add subdirs of existing dirs
+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+			  cf_have_incdir=yes; break
+			fi
+		  done
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  if test "$cf_add_incdir" = /usr/local/include ; then
+			if test "$GCC" = yes
+			then
+			  cf_save_CPPFLAGS=$CPPFLAGS
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+			  cat >"conftest.$ac_ext" <<_ACEOF
+#line 42134 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main (void)
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:42146: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:42149: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:42152: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42155: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_have_incdir=yes
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me:-configure}:42172: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+		  cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`
+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
+		  cf_add_incdir="$cf_top_incdir"
+		else
+		  break
+		fi
+	  else
+		break
+	  fi
+	done
+  done
+fi
+
+	elif test -d "$cf_searchpath/../include" ; then
+
+if test -n "$cf_searchpath/../include" ; then
+  for cf_add_incdir in $cf_searchpath/../include
+  do
+	while test "$cf_add_incdir" != /usr/include
+	do
+	  if test -d "$cf_add_incdir"
+	  then
+		cf_have_incdir=no
+		if test -n "$CFLAGS$CPPFLAGS" ; then
+		  # a loop is needed to ensure we can add subdirs of existing dirs
+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+			  cf_have_incdir=yes; break
+			fi
+		  done
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  if test "$cf_add_incdir" = /usr/local/include ; then
+			if test "$GCC" = yes
+			then
+			  cf_save_CPPFLAGS=$CPPFLAGS
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+			  cat >"conftest.$ac_ext" <<_ACEOF
+#line 42218 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main (void)
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:42230: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:42233: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:42236: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42239: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_have_incdir=yes
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me:-configure}:42256: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+		  cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`
+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
+		  cf_add_incdir="$cf_top_incdir"
+		else
+		  break
+		fi
+	  else
+		break
+	  fi
+	done
+  done
+fi
+
+	else
+{ { echo "$as_me:42274: error: cannot find  under $use_brotli" >&5
+echo "$as_me: error: cannot find  under $use_brotli" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	if test -d "$cf_searchpath/lib" ; then
+
+if test -n "$cf_searchpath/lib" ; then
+	for cf_add_libdir in $cf_searchpath/lib
+	do
+		if test "$cf_add_libdir" = /usr/lib ; then
+			:
+		elif test -d "$cf_add_libdir"
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:42299: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
+fi
+
+	elif test -d "$cf_searchpath" ; then
+
+if test -n "$cf_searchpath" ; then
+	for cf_add_libdir in $cf_searchpath
+	do
+		if test "$cf_add_libdir" = /usr/lib ; then
+			:
+		elif test -d "$cf_add_libdir"
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:42328: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
+fi
+
+	else
+{ { echo "$as_me:42337: error: cannot find  under $use_brotli" >&5
+echo "$as_me: error: cannot find  under $use_brotli" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+done
+
+	;;
+esac
+
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_brotlidec=
+cf_cv_library_path_brotlidec=
+
+echo "${as_me:-configure}:42351: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+
+cf_save_LIBS="$LIBS"
+
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 42356 "configure"
+#include "confdefs.h"
+
+#include <brotli/decode.h>
+
+int
+main (void)
+{
+
+    BrotliDecoderDecompressStream(
+		NULL,	/* BrotliDecoderState* state */
+		NULL,	/* size_t* available_in */
+		NULL,	/* const uint8_t** next_in */
+		NULL,	/* size_t* available_out */
+		NULL,	/* uint8_t** next_out */
+		NULL	/* size_t* total_out */
+	);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:42379: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:42382: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:42385: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42388: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+
+	cf_cv_find_linkage_brotlidec=yes
+	cf_cv_header_path_brotlidec=/usr/include
+	cf_cv_library_path_brotlidec=/usr/lib
+
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+LIBS="-lbrotlidec  $cf_save_LIBS"
+
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 42402 "configure"
+#include "confdefs.h"
+
+#include <brotli/decode.h>
+
+int
+main (void)
+{
+
+    BrotliDecoderDecompressStream(
+		NULL,	/* BrotliDecoderState* state */
+		NULL,	/* size_t* available_in */
+		NULL,	/* const uint8_t** next_in */
+		NULL,	/* size_t* available_out */
+		NULL,	/* uint8_t** next_out */
+		NULL	/* size_t* total_out */
+	);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:42425: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:42428: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:42431: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42434: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+
+	cf_cv_find_linkage_brotlidec=yes
+	cf_cv_header_path_brotlidec=/usr/include
+	cf_cv_library_path_brotlidec=/usr/lib
+	cf_cv_library_file_brotlidec="-lbrotlidec"
+
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+	cf_cv_find_linkage_brotlidec=no
+	LIBS="$cf_save_LIBS"
+
+	test -n "$verbose" && echo "	find linkage for brotlidec library" 1>&6
+
+echo "${as_me:-configure}:42451: testing find linkage for brotlidec library ..." 1>&5
+
+echo "${as_me:-configure}:42453: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	cf_test_CPPFLAGS="$CPPFLAGS"
+
+cf_search=
+
+# collect the current set of include-directories from compiler flags
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case "$cf_header_path" in
+		(-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "x$cf_header_path" != "xNONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+	test -d "$cf_header_path/include/brotlilib" &&       cf_search="$cf_search $cf_header_path/include/brotlilib"
+	test -d "$cf_header_path/include/brotlilib/include" &&    cf_search="$cf_search $cf_header_path/include/brotlilib/include"
+	test -d "$cf_header_path/brotlilib/include" &&       cf_search="$cf_search $cf_header_path/brotlilib/include"
+	test -d "$cf_header_path/brotlilib/include/brotlilib" &&    cf_search="$cf_search $cf_header_path/brotlilib/include/brotlilib"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+# add the variations for the package we are looking for
+
+cf_search=
+
+test "x$prefix" != "xNONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
+	test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+	test -d "$prefix/include/brotlilib" &&       cf_search="$cf_search $prefix/include/brotlilib"
+	test -d "$prefix/include/brotlilib/include" &&    cf_search="$cf_search $prefix/include/brotlilib/include"
+	test -d "$prefix/brotlilib/include" &&       cf_search="$cf_search $prefix/brotlilib/include"
+	test -d "$prefix/brotlilib/include/brotlilib" &&    cf_search="$cf_search $prefix/brotlilib/include/brotlilib"
+}
+
+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/brotlilib" &&       cf_search="$cf_search $cf_subdir_prefix/include/brotlilib"
+	test -d "$cf_subdir_prefix/include/brotlilib/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/brotlilib/include"
+	test -d "$cf_subdir_prefix/brotlilib/include" &&       cf_search="$cf_search $cf_subdir_prefix/brotlilib/include"
+	test -d "$cf_subdir_prefix/brotlilib/include/brotlilib" &&    cf_search="$cf_search $cf_subdir_prefix/brotlilib/include/brotlilib"
+}
+
+done
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d "$includedir" &&    cf_search="$cf_search $includedir"
+	test -d "$includedir/brotlilib" && cf_search="$cf_search $includedir/brotlilib"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+	test -d "$oldincludedir/brotlilib" && cf_search="$cf_search $oldincludedir/brotlilib"
+}
+
+cf_search="$cf_search $cf_header_path_list"
+
+	for cf_cv_header_path_brotlidec in $cf_search
+	do
+		if test -d "$cf_cv_header_path_brotlidec" ; then
+			test -n "$verbose" && echo "	... testing $cf_cv_header_path_brotlidec" 1>&6
+
+echo "${as_me:-configure}:42544: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_brotlidec"
+
+			cat >"conftest.$ac_ext" <<_ACEOF
+#line 42552 "configure"
+#include "confdefs.h"
+
+#include <brotli/decode.h>
+
+int
+main (void)
+{
+
+    BrotliDecoderDecompressStream(
+		NULL,	/* BrotliDecoderState* state */
+		NULL,	/* size_t* available_in */
+		NULL,	/* const uint8_t** next_in */
+		NULL,	/* size_t* available_out */
+		NULL,	/* uint8_t** next_out */
+		NULL	/* size_t* total_out */
+	);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:42575: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:42578: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:42581: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42584: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+
+				test -n "$verbose" && echo "	... found brotlidec headers in $cf_cv_header_path_brotlidec" 1>&6
+
+echo "${as_me:-configure}:42589: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
+
+				cf_cv_find_linkage_brotlidec=maybe
+				cf_test_CPPFLAGS="$CPPFLAGS"
+				break
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+				CPPFLAGS="$cf_save_CPPFLAGS"
+
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+		fi
+	done
+
+	if test "$cf_cv_find_linkage_brotlidec" = maybe ; then
+
+echo "${as_me:-configure}:42607: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+
+		cf_save_LIBS="$LIBS"
+		cf_save_LDFLAGS="$LDFLAGS"
+
+		CPPFLAGS="$cf_test_CPPFLAGS"
+		LIBS="-lbrotlidec  $cf_save_LIBS"
+		cat >"conftest.$ac_ext" <<_ACEOF
+#line 42615 "configure"
+#include "confdefs.h"
+
+#include <brotli/decode.h>
+
+int
+main (void)
+{
+
+    BrotliDecoderDecompressStream(
+		NULL,	/* BrotliDecoderState* state */
+		NULL,	/* size_t* available_in */
+		NULL,	/* const uint8_t** next_in */
+		NULL,	/* size_t* available_out */
+		NULL,	/* uint8_t** next_out */
+		NULL	/* size_t* total_out */
+	);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:42638: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:42641: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:42644: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42647: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+
+			test -n "$verbose" && echo "	... found brotlidec library in system" 1>&6
+
+echo "${as_me:-configure}:42652: testing ... found brotlidec library in system ..." 1>&5
+
+			cf_cv_find_linkage_brotlidec=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LIBS="$cf_save_LIBS"
+
+		if test "$cf_cv_find_linkage_brotlidec" != yes ; then
+
+cf_search=
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case "$cf_library_path" in
+		(-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "x$cf_library_path" != "xNONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d "$cf_library_path/lib/brotlidec" &&       cf_search="$cf_search $cf_library_path/lib/brotlidec"
+	test -d "$cf_library_path/lib/brotlidec/lib" &&    cf_search="$cf_search $cf_library_path/lib/brotlidec/lib"
+	test -d "$cf_library_path/brotlidec/lib" &&       cf_search="$cf_search $cf_library_path/brotlidec/lib"
+	test -d "$cf_library_path/brotlidec/lib/brotlidec" &&    cf_search="$cf_search $cf_library_path/brotlidec/lib/brotlidec"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=
+
+test "x$prefix" != "xNONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
+	test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+	test -d "$prefix/lib/brotlidec" &&       cf_search="$cf_search $prefix/lib/brotlidec"
+	test -d "$prefix/lib/brotlidec/lib" &&    cf_search="$cf_search $prefix/lib/brotlidec/lib"
+	test -d "$prefix/brotlidec/lib" &&       cf_search="$cf_search $prefix/brotlidec/lib"
+	test -d "$prefix/brotlidec/lib/brotlidec" &&    cf_search="$cf_search $prefix/brotlidec/lib/brotlidec"
+}
+
+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/brotlidec" &&       cf_search="$cf_search $cf_subdir_prefix/lib/brotlidec"
+	test -d "$cf_subdir_prefix/lib/brotlidec/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/brotlidec/lib"
+	test -d "$cf_subdir_prefix/brotlidec/lib" &&       cf_search="$cf_search $cf_subdir_prefix/brotlidec/lib"
+	test -d "$cf_subdir_prefix/brotlidec/lib/brotlidec" &&    cf_search="$cf_search $cf_subdir_prefix/brotlidec/lib/brotlidec"
+}
+
+done
+
+cf_search="$cf_library_path_list $cf_search"
+
+			for cf_cv_library_path_brotlidec in $cf_search
+			do
+				if test -d "$cf_cv_library_path_brotlidec" ; then
+					test -n "$verbose" && echo "	... testing $cf_cv_library_path_brotlidec" 1>&6
+
+echo "${as_me:-configure}:42733: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5
+
+					CPPFLAGS="$cf_test_CPPFLAGS"
+					LIBS="-lbrotlidec  $cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_brotlidec"
+					cat >"conftest.$ac_ext" <<_ACEOF
+#line 42739 "configure"
+#include "confdefs.h"
+
+#include <brotli/decode.h>
+
+int
+main (void)
+{
+
+    BrotliDecoderDecompressStream(
+		NULL,	/* BrotliDecoderState* state */
+		NULL,	/* size_t* available_in */
+		NULL,	/* const uint8_t** next_in */
+		NULL,	/* size_t* available_out */
+		NULL,	/* uint8_t** next_out */
+		NULL	/* size_t* total_out */
+	);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:42762: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:42765: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:42768: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42771: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+
+					test -n "$verbose" && echo "	... found brotlidec library in $cf_cv_library_path_brotlidec" 1>&6
+
+echo "${as_me:-configure}:42776: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
+
+					cf_cv_find_linkage_brotlidec=yes
+					cf_cv_library_file_brotlidec="-lbrotlidec"
+					break
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+					CPPFLAGS="$cf_save_CPPFLAGS"
+					LIBS="$cf_save_LIBS"
+					LDFLAGS="$cf_save_LDFLAGS"
+
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+				fi
+			done
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			LDFLAGS="$cf_save_LDFLAGS"
+		fi
+
+	else
+		cf_cv_find_linkage_brotlidec=no
+	fi
+
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+LIBS="$cf_save_LIBS"
+
+if test "$cf_cv_find_linkage_brotlidec" = yes ; then
+
+if test -n "$cf_cv_header_path_brotlidec" ; then
+  for cf_add_incdir in $cf_cv_header_path_brotlidec
+  do
+	while test "$cf_add_incdir" != /usr/include
+	do
+	  if test -d "$cf_add_incdir"
+	  then
+		cf_have_incdir=no
+		if test -n "$CFLAGS$CPPFLAGS" ; then
+		  # a loop is needed to ensure we can add subdirs of existing dirs
+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+			  cf_have_incdir=yes; break
+			fi
+		  done
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  if test "$cf_add_incdir" = /usr/local/include ; then
+			if test "$GCC" = yes
+			then
+			  cf_save_CPPFLAGS=$CPPFLAGS
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+			  cat >"conftest.$ac_ext" <<_ACEOF
+#line 42838 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main (void)
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:42850: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:42853: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:42856: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:42859: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_have_incdir=yes
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me:-configure}:42876: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+		  cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`
+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
+		  cf_add_incdir="$cf_top_incdir"
+		else
+		  break
+		fi
+	  else
+		break
+	  fi
+	done
+  done
+fi
+
+if test -n "$cf_cv_library_path_brotlidec" ; then
+	for cf_add_libdir in $cf_cv_library_path_brotlidec
+	do
+		if test "$cf_add_libdir" = /usr/lib ; then
+			:
+		elif test -d "$cf_add_libdir"
+		then
+			cf_have_libdir=no
+			if test -n "$LDFLAGS$LIBS" ; then
+				# a loop is needed to ensure we can add subdirs of existing dirs
+				for cf_test_libdir in $LDFLAGS $LIBS ; do
+					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+						cf_have_libdir=yes; break
+					fi
+				done
+			fi
+			if test "$cf_have_libdir" = no ; then
+				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:42912: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+			fi
+		fi
+	done
+fi
+
+cf_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+for cf_add_1lib in -lbrotlidec; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+# filter duplicates
+for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs"
+done
+LIBS="$cf_add_libs"
+
+else
+{ echo "$as_me:42937: WARNING: Cannot find brotlidec library" >&5
+echo "$as_me: WARNING: Cannot find brotlidec library" >&2;}
+fi
+
+	test "x$cf_cv_find_linkage_brotlidec" = "xyes" &&
+cat >>confdefs.h <<\EOF
+#define USE_BROTLI 1
+EOF
+
+fi
+
+echo "$as_me:42948: 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.
@@ -42095,14 +42962,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:42098: result: $use_finger" >&5
+echo "$as_me:42965: 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:42105: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:42972: 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.
@@ -42119,14 +42986,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:42122: result: $use_gopher" >&5
+echo "$as_me:42989: 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:42129: checking if you want to exclude NEWS code" >&5
+echo "$as_me:42996: 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.
@@ -42143,14 +43010,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:42146: result: $use_news" >&5
+echo "$as_me:43013: 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:42153: checking if you want to exclude FTP code" >&5
+echo "$as_me:43020: 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.
@@ -42167,14 +43034,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:42170: result: $use_ftp" >&5
+echo "$as_me:43037: 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:42177: checking if you want to include WAIS code" >&5
+echo "$as_me:43044: 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.
@@ -42191,13 +43058,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:42194: result: $use_wais" >&5
+echo "$as_me:43061: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test "$use_wais" != "no"
 then
-	echo "$as_me:42200: checking for fs_free in -lwais" >&5
+	echo "$as_me:43067: 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
@@ -42205,7 +43072,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42208 "configure"
+#line 43075 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42224,16 +43091,16 @@ fs_free ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42230: \$? = $ac_status" >&5
+  echo "$as_me:43097: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42236: \$? = $ac_status" >&5
+  echo "$as_me:43103: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -42244,18 +43111,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42247: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:43114: 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:42251: checking if -lm needed for math functions" >&5
+echo "$as_me:43118: 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 42258 "configure"
+#line 43125 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -42271,16 +43138,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42277: \$? = $ac_status" >&5
+  echo "$as_me:43144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42283: \$? = $ac_status" >&5
+  echo "$as_me:43150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -42290,7 +43157,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42293: result: $cf_cv_need_libm" >&5
+echo "$as_me:43160: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -42332,23 +43199,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42335: checking for $ac_header" >&5
+echo "$as_me:43202: 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 42341 "configure"
+#line 43208 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42345: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:43212: \"$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:42351: \$? = $ac_status" >&5
+  echo "$as_me:43218: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42367,7 +43234,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:42370: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:43237: 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
@@ -42380,7 +43247,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:42383: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:43250: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -42388,7 +43255,7 @@ fi
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:42391: checking if directory-editor code should be used" >&5
+echo "$as_me:43258: 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.
@@ -42405,7 +43272,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:42408: result: $use_dired" >&5
+echo "$as_me:43275: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -42415,7 +43282,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:42418: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:43285: 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.
@@ -42432,10 +43299,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:42435: result: $enableval" >&5
+	echo "$as_me:43302: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42438: checking if DirEd mode should override keys" >&5
+	echo "$as_me:43305: 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.
@@ -42459,10 +43326,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:42462: result: $enableval" >&5
+	echo "$as_me:43329: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42465: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:43332: 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.
@@ -42486,10 +43353,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:42489: result: $enableval" >&5
+	echo "$as_me:43356: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42492: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:43359: 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.
@@ -42506,10 +43373,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:42509: result: $enableval" >&5
+	echo "$as_me:43376: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42512: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:43379: 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.
@@ -42533,10 +43400,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:42536: result: $enableval" >&5
+	echo "$as_me:43403: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42539: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:43406: 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.
@@ -42560,10 +43427,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:42563: result: $enableval" >&5
+	echo "$as_me:43430: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42566: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:43433: 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.
@@ -42587,10 +43454,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:42590: result: $enableval" >&5
+	echo "$as_me:43457: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42593: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:43460: 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.
@@ -42614,11 +43481,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:42617: result: $enableval" >&5
+	echo "$as_me:43484: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:42621: checking if you want long-directory listings" >&5
+echo "$as_me:43488: 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.
@@ -42642,10 +43509,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:42645: result: $enableval" >&5
+echo "$as_me:43512: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:42648: checking if parent-directory references are permitted" >&5
+echo "$as_me:43515: 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.
@@ -42662,7 +43529,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:42665: result: $enableval" >&5
+echo "$as_me:43532: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET="telnet"
@@ -42670,7 +43537,7 @@ for ac_prog in $TELNET telnet
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:42673: checking for $ac_word" >&5
+echo "$as_me:43540: 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
@@ -42687,7 +43554,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TELNET="$ac_dir/$ac_word"
-   echo "$as_me:42690: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43557: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -42698,10 +43565,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:42701: result: $TELNET" >&5
+  echo "$as_me:43568: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:42704: result: no" >&5
+  echo "$as_me:43571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42760,7 +43627,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:42763: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43630: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -42778,7 +43645,7 @@ for ac_prog in $TN3270 tn3270
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:42781: checking for $ac_word" >&5
+echo "$as_me:43648: 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
@@ -42795,7 +43662,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TN3270="$ac_dir/$ac_word"
-   echo "$as_me:42798: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43665: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -42806,10 +43673,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:42809: result: $TN3270" >&5
+  echo "$as_me:43676: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:42812: result: no" >&5
+  echo "$as_me:43679: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42868,7 +43735,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:42871: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43738: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -42886,7 +43753,7 @@ for ac_prog in $RLOGIN rlogin
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:42889: checking for $ac_word" >&5
+echo "$as_me:43756: 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
@@ -42903,7 +43770,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RLOGIN="$ac_dir/$ac_word"
-   echo "$as_me:42906: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43773: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -42914,10 +43781,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:42917: result: $RLOGIN" >&5
+  echo "$as_me:43784: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:42920: result: no" >&5
+  echo "$as_me:43787: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42976,7 +43843,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:42979: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43846: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -42994,7 +43861,7 @@ for ac_prog in $MV mv
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:42997: checking for $ac_word" >&5
+echo "$as_me:43864: 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
@@ -43011,7 +43878,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_MV="$ac_dir/$ac_word"
-   echo "$as_me:43014: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43881: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43022,10 +43889,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:43025: result: $MV" >&5
+  echo "$as_me:43892: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:43028: result: no" >&5
+  echo "$as_me:43895: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43084,7 +43951,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43087: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43954: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -43102,7 +43969,7 @@ for ac_prog in $GZIP gzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43105: checking for $ac_word" >&5
+echo "$as_me:43972: 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
@@ -43119,7 +43986,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:43122: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43989: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43130,10 +43997,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:43133: result: $GZIP" >&5
+  echo "$as_me:44000: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:43136: result: no" >&5
+  echo "$as_me:44003: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43192,7 +44059,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43195: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44062: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -43210,7 +44077,7 @@ for ac_prog in $UNCOMPRESS gunzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43213: checking for $ac_word" >&5
+echo "$as_me:44080: 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
@@ -43227,7 +44094,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:43230: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44097: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43238,10 +44105,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:43241: result: $UNCOMPRESS" >&5
+  echo "$as_me:44108: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:43244: result: no" >&5
+  echo "$as_me:44111: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43300,7 +44167,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43303: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44170: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -43318,7 +44185,7 @@ for ac_prog in $UNZIP unzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43321: checking for $ac_word" >&5
+echo "$as_me:44188: 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
@@ -43335,7 +44202,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNZIP="$ac_dir/$ac_word"
-   echo "$as_me:43338: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44205: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43346,10 +44213,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:43349: result: $UNZIP" >&5
+  echo "$as_me:44216: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:43352: result: no" >&5
+  echo "$as_me:44219: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43408,7 +44275,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43411: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44278: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -43426,7 +44293,7 @@ for ac_prog in $BZIP2 bzip2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43429: checking for $ac_word" >&5
+echo "$as_me:44296: 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
@@ -43443,7 +44310,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_BZIP2="$ac_dir/$ac_word"
-   echo "$as_me:43446: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44313: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43454,10 +44321,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:43457: result: $BZIP2" >&5
+  echo "$as_me:44324: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:43460: result: no" >&5
+  echo "$as_me:44327: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43516,7 +44383,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43519: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44386: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -43529,12 +44396,120 @@ EOF
 
 fi
 
+test -z "$BROTLI" && BROTLI="brotli"
+for ac_prog in $BROTLI brotli
+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:44404: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_BROTLI+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $BROTLI in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BROTLI="$BROTLI" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_BROTLI="$ac_dir/$ac_word"
+   echo "$as_me:44421: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+BROTLI=$ac_cv_path_BROTLI
+
+if test -n "$BROTLI"; then
+  echo "$as_me:44432: result: $BROTLI" >&5
+echo "${ECHO_T}$BROTLI" >&6
+else
+  echo "$as_me:44435: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$BROTLI" && break
+done
+test -n "$BROTLI" || BROTLI="$BROTLI"
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+for cf_temp in $ac_cv_path_BROTLI
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+
+if test "x$prefix" != xNONE; then
+	cf_path_syntax="$prefix"
+else
+	cf_path_syntax="$ac_default_prefix"
+fi
+
+case ".$cf_temp" in
+(.\$\(*\)*|.\'*\'*)
+	;;
+(..|./*|.\\*)
+	;;
+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+	;;
+(.\$\{*prefix\}*|.\$\{*dir\}*)
+	eval cf_temp="$cf_temp"
+	case ".$cf_temp" in
+	(.NONE/*)
+		cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+		;;
+	esac
+	;;
+(.no|.NONE/*)
+	cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+	;;
+(*)
+	break
+	;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename "$cf_temp"`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+
+echo "${as_me:-configure}:44494: testing defining path for ${cf_path_prog} ..." 1>&5
+
+cat >>confdefs.h <<EOF
+#define BROTLI_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
+#define BROTLI_ARGS "$cf_path_args"
+EOF
+
+fi
+
 test -z "$TAR" && TAR="tar"
 for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43537: checking for $ac_word" >&5
+echo "$as_me:44512: 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
@@ -43551,7 +44526,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TAR="$ac_dir/$ac_word"
-   echo "$as_me:43554: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44529: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43562,10 +44537,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:43565: result: $TAR" >&5
+  echo "$as_me:44540: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:43568: result: no" >&5
+  echo "$as_me:44543: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43624,7 +44599,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43627: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44602: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -43682,7 +44657,7 @@ for ac_prog in $COMPRESS compress
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43685: checking for $ac_word" >&5
+echo "$as_me:44660: 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
@@ -43699,7 +44674,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:43702: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44677: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43710,10 +44685,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:43713: result: $COMPRESS" >&5
+  echo "$as_me:44688: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:43716: result: no" >&5
+  echo "$as_me:44691: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43772,7 +44747,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43775: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44750: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -43790,7 +44765,7 @@ for ac_prog in $RM rm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43793: checking for $ac_word" >&5
+echo "$as_me:44768: 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
@@ -43807,7 +44782,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RM="$ac_dir/$ac_word"
-   echo "$as_me:43810: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44785: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43818,10 +44793,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:43821: result: $RM" >&5
+  echo "$as_me:44796: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:43824: result: no" >&5
+  echo "$as_me:44799: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43880,7 +44855,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43883: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44858: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -43898,7 +44873,7 @@ for ac_prog in $UUDECODE uudecode
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43901: checking for $ac_word" >&5
+echo "$as_me:44876: 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
@@ -43915,7 +44890,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UUDECODE="$ac_dir/$ac_word"
-   echo "$as_me:43918: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44893: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43926,10 +44901,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:43929: result: $UUDECODE" >&5
+  echo "$as_me:44904: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:43932: result: no" >&5
+  echo "$as_me:44907: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43988,7 +44963,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43991: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44966: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -44006,7 +44981,7 @@ for ac_prog in $ZCAT zcat
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:44009: checking for $ac_word" >&5
+echo "$as_me:44984: 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
@@ -44023,7 +44998,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZCAT="$ac_dir/$ac_word"
-   echo "$as_me:44026: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45001: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44034,10 +45009,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:44037: result: $ZCAT" >&5
+  echo "$as_me:45012: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:44040: result: no" >&5
+  echo "$as_me:45015: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44096,7 +45071,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44099: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45074: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -44114,7 +45089,7 @@ for ac_prog in $ZIP zip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:44117: checking for $ac_word" >&5
+echo "$as_me:45092: 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
@@ -44131,7 +45106,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZIP="$ac_dir/$ac_word"
-   echo "$as_me:44134: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45109: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44142,10 +45117,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:44145: result: $ZIP" >&5
+  echo "$as_me:45120: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:44148: result: no" >&5
+  echo "$as_me:45123: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44204,7 +45179,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44207: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45182: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -44232,7 +45207,7 @@ for ac_prog in $INSTALL install
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:44235: checking for $ac_word" >&5
+echo "$as_me:45210: 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
@@ -44249,7 +45224,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INSTALL="$ac_dir/$ac_word"
-   echo "$as_me:44252: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45227: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44260,10 +45235,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:44263: result: $INSTALL" >&5
+  echo "$as_me:45238: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:44266: result: no" >&5
+  echo "$as_me:45241: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44322,7 +45297,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44325: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45300: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -44352,7 +45327,7 @@ if test "$cf_cv_screen" = pdcurses ; then
 	case "$host_os" in
 	(mingw*)
 
-echo "$as_me:44355: checking for initscr in -lpdcurses" >&5
+echo "$as_me:45330: 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
@@ -44360,7 +45335,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 44363 "configure"
+#line 45338 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -44379,16 +45354,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:44382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44385: \$? = $ac_status" >&5
+  echo "$as_me:45360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:44388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44391: \$? = $ac_status" >&5
+  echo "$as_me:45366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -44399,7 +45374,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:44402: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:45377: 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
 
@@ -44421,13 +45396,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:44424: checking for winwstr" >&5
+	echo "$as_me:45399: 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 44430 "configure"
+#line 45405 "configure"
 #include "confdefs.h"
 #define winwstr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -44458,16 +45433,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:44461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44464: \$? = $ac_status" >&5
+  echo "$as_me:45439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:44467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44470: \$? = $ac_status" >&5
+  echo "$as_me:45445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -44477,7 +45452,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:44480: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:45455: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test "$ac_cv_func_winwstr" = yes; then
 
@@ -44487,13 +45462,13 @@ EOF
 
 fi
 
-	echo "$as_me:44490: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:45465: 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 44496 "configure"
+#line 45471 "configure"
 #include "confdefs.h"
 #define pdcurses_dll_iname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -44524,16 +45499,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:44527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44530: \$? = $ac_status" >&5
+  echo "$as_me:45505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:44533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44536: \$? = $ac_status" >&5
+  echo "$as_me:45511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -44543,7 +45518,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:44546: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:45521: 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
 
@@ -44560,7 +45535,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:44563: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:45538: 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=
 
@@ -44571,14 +45546,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:44574: result: yes" >&5
+	echo "$as_me:45549: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:44577: result: no" >&5
+	echo "$as_me:45552: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:44581: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:45556: 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=
 
@@ -44589,14 +45564,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:44592: result: yes" >&5
+	echo "$as_me:45567: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:44595: result: no" >&5
+	echo "$as_me:45570: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:44599: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:45574: 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=
 
@@ -44607,14 +45582,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:44610: result: yes" >&5
+	echo "$as_me:45585: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:44613: result: no" >&5
+	echo "$as_me:45588: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:44617: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:45592: 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=
 
@@ -44625,10 +45600,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:44628: result: yes" >&5
+	echo "$as_me:45603: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:44631: result: no" >&5
+	echo "$as_me:45606: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44648,17 +45623,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:44651: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:45626: 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}:44657: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45632: 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}:44661: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45636: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -44789,20 +45764,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:44792: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:45767: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:44798: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:45773: 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 44805 "configure"
+#line 45780 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -44819,16 +45794,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:44822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44825: \$? = $ac_status" >&5
+  echo "$as_me:45800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:44828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44831: \$? = $ac_status" >&5
+  echo "$as_me:45806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -44838,7 +45813,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:44841: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:45816: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -44850,7 +45825,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:44853: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:45828: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -44858,17 +45833,17 @@ echo "${as_me:-configure}:44853: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:44861: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:45836: 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}:44867: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45842: 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}:44871: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45846: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -44988,12 +45963,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:44991: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:45966: 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}:44996: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:45971: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -45001,12 +45976,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:45004: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:45979: 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}:45009: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:45984: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -45017,7 +45992,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:45020: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:45995: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -45042,17 +46017,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:45045: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:46020: 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}:45051: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46026: 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}:45055: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46030: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45173,7 +46148,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:45176: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:46151: 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
@@ -45181,7 +46156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45184 "configure"
+#line 46159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -45200,16 +46175,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45206: \$? = $ac_status" >&5
+  echo "$as_me:46181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45212: \$? = $ac_status" >&5
+  echo "$as_me:46187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -45220,7 +46195,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:45223: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:46198: 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
 
@@ -45256,17 +46231,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:45259: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:46234: 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}:45265: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46240: 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}:45269: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46244: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45386,24 +46361,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:45389: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:46364: 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}:45396: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:46371: 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}:45402: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46377: 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}:45406: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46381: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45523,24 +46498,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:45526: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:46501: 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}:45533: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:46508: 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}:45539: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46514: 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}:45543: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46518: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45660,24 +46635,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:45663: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:46638: 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}:45670: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46645: 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}:45676: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46651: 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}:45680: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46655: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45797,7 +46772,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:45800: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:46775: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -45810,17 +46785,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:45813: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46788: 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}:45819: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46794: 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}:45823: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46798: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45941,14 +46916,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:45944: checking for usable X dependency" >&5
+echo "$as_me:46919: 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 45951 "configure"
+#line 46926 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -45967,16 +46942,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45970: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45973: \$? = $ac_status" >&5
+  echo "$as_me:46948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45979: \$? = $ac_status" >&5
+  echo "$as_me:46954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -45986,30 +46961,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45989: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:46964: 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}:45995: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:46970: 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}:46002: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:46977: 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}:46008: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46983: 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}:46012: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46987: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46132,12 +47107,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46135: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47110: 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}:46140: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47115: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -46145,14 +47120,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:46148: checking for usable X Toolkit package" >&5
+echo "$as_me:47123: 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 46155 "configure"
+#line 47130 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -46167,16 +47142,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46173: \$? = $ac_status" >&5
+  echo "$as_me:47148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46179: \$? = $ac_status" >&5
+  echo "$as_me:47154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -46186,7 +47161,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:46189: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:47164: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -46200,22 +47175,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:46203: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:47178: 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}:46208: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:47183: 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}:46214: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47189: 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}:46218: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47193: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46334,17 +47309,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:46337: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:47312: 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}:46343: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47318: 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}:46347: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47322: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46473,12 +47448,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46476: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47451: 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}:46481: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47456: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -46498,7 +47473,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:46501: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47476: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -46583,7 +47558,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:46586: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:47561: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -46593,7 +47568,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:46596: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:47571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -46603,7 +47578,7 @@ 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}:46606: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:47581: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -46612,7 +47587,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 46615 "configure"
+#line 47590 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -46624,16 +47599,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46630: \$? = $ac_status" >&5
+  echo "$as_me:47605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46636: \$? = $ac_status" >&5
+  echo "$as_me:47611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -46641,12 +47616,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:46644: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47619: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:46649: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:47624: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -46654,13 +47629,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:46657: checking for XOpenDisplay" >&5
+	echo "$as_me:47632: 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 46663 "configure"
+#line 47638 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -46691,16 +47666,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46697: \$? = $ac_status" >&5
+  echo "$as_me:47672: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46703: \$? = $ac_status" >&5
+  echo "$as_me:47678: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -46710,13 +47685,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:46713: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:47688: 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:46719: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:47694: 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
@@ -46724,7 +47699,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 46727 "configure"
+#line 47702 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -46743,16 +47718,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46749: \$? = $ac_status" >&5
+  echo "$as_me:47724: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46755: \$? = $ac_status" >&5
+  echo "$as_me:47730: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -46763,7 +47738,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:46766: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:47741: 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
 
@@ -46787,13 +47762,13 @@ fi
 
 fi
 
-	echo "$as_me:46790: checking for XtAppInitialize" >&5
+	echo "$as_me:47765: 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 46796 "configure"
+#line 47771 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -46824,16 +47799,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46830: \$? = $ac_status" >&5
+  echo "$as_me:47805: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46836: \$? = $ac_status" >&5
+  echo "$as_me:47811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -46843,13 +47818,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:46846: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:47821: 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:46852: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:47827: 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
@@ -46857,7 +47832,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 46860 "configure"
+#line 47835 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -46876,16 +47851,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47854: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46882: \$? = $ac_status" >&5
+  echo "$as_me:47857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46888: \$? = $ac_status" >&5
+  echo "$as_me:47863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -46896,7 +47871,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:46899: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:47874: 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
 
@@ -46913,7 +47888,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:46916: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:47891: 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
@@ -46954,14 +47929,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:46957: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:47932: 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:46960: checking for $cf_test" >&5
+			echo "$as_me:47935: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 46964 "configure"
+#line 47939 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -46975,16 +47950,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:46978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:47953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:46981: \$? = $ac_status" >&5
+  echo "$as_me:47956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:46984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46987: \$? = $ac_status" >&5
+  echo "$as_me:47962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -46993,7 +47968,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:46996: result: $cf_result" >&5
+		echo "$as_me:47971: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -47009,7 +47984,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:47012: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:47987: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -47074,10 +48049,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:47077: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:48052: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 47080 "configure"
+#line 48055 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -47093,16 +48068,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47099: \$? = $ac_status" >&5
+  echo "$as_me:48074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47105: \$? = $ac_status" >&5
+  echo "$as_me:48080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -47111,7 +48086,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:47114: result: $cf_result" >&5
+		echo "$as_me:48089: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -47128,7 +48103,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:47131: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:48106: 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
@@ -47162,7 +48137,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:47165: checking for $ac_word" >&5
+echo "$as_me:48140: 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
@@ -47177,7 +48152,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:47180: found $ac_dir/$ac_word" >&5
+echo "$as_me:48155: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -47185,10 +48160,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:47188: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:48163: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:47191: result: no" >&5
+  echo "$as_me:48166: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -47201,7 +48176,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:47204: checking for $ac_word" >&5
+echo "$as_me:48179: 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
@@ -47216,7 +48191,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:47219: found $ac_dir/$ac_word" >&5
+echo "$as_me:48194: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -47224,10 +48199,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:47227: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:48202: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:47230: result: no" >&5
+  echo "$as_me:48205: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -47362,7 +48337,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47365: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48340: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -47447,7 +48422,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:47450: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:48425: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -47457,7 +48432,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:47460: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:48435: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -47467,7 +48442,7 @@ 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}:47470: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:48445: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -47476,7 +48451,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47479 "configure"
+#line 48454 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -47488,16 +48463,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47494: \$? = $ac_status" >&5
+  echo "$as_me:48469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47500: \$? = $ac_status" >&5
+  echo "$as_me:48475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -47505,12 +48480,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47508: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48483: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:47513: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:48488: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -47518,7 +48493,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:47521: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:48496: 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
@@ -47526,7 +48501,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47529 "configure"
+#line 48504 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47545,16 +48520,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47551: \$? = $ac_status" >&5
+  echo "$as_me:48526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47557: \$? = $ac_status" >&5
+  echo "$as_me:48532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -47565,7 +48540,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47568: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:48543: 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
 
@@ -47587,7 +48562,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:47590: checking for XCurses library" >&5
+echo "$as_me:48565: 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
@@ -47610,7 +48585,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47613 "configure"
+#line 48588 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -47625,16 +48600,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47631: \$? = $ac_status" >&5
+  echo "$as_me:48606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47637: \$? = $ac_status" >&5
+  echo "$as_me:48612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -47645,7 +48620,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:47648: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:48623: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -47660,23 +48635,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:47663: checking for xcurses.h" >&5
+	echo "$as_me:48638: 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 47669 "configure"
+#line 48644 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:47673: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48648: \"$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:47679: \$? = $ac_status" >&5
+  echo "$as_me:48654: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -47695,7 +48670,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:47698: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:48673: 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
 
@@ -47706,7 +48681,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:47709: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:48684: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -47715,7 +48690,7 @@ fi
 	esac
 else
 
-echo "$as_me:47718: checking if we can include termio.h with curses" >&5
+echo "$as_me:48693: 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
@@ -47725,7 +48700,7 @@ else
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 47728 "configure"
+#line 48703 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -47739,16 +48714,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:47742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:47745: \$? = $ac_status" >&5
+  echo "$as_me:48720: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:47748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47751: \$? = $ac_status" >&5
+  echo "$as_me:48726: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -47761,7 +48736,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:47764: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:48739: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test "$cf_cv_termio_and_curses" = yes &&
@@ -47778,23 +48753,23 @@ if test "$cf_cv_screen" != slang ; then
 for ac_header in $cf_cv_screen/term.h term.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:47781: checking for $ac_header" >&5
+echo "$as_me:48756: 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 47787 "configure"
+#line 48762 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:47791: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48766: \"$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:47797: \$? = $ac_status" >&5
+  echo "$as_me:48772: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -47813,7 +48788,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:47816: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:48791: 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
@@ -47825,7 +48800,7 @@ done
 
 	fi
 
-echo "$as_me:47828: checking if curses supports alternate-character set" >&5
+echo "$as_me:48803: 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
@@ -47834,7 +48809,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 47837 "configure"
+#line 48812 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -47848,16 +48823,16 @@ chtype x = ${mapname}['l']; ${mapname}['m'] = 0; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47854: \$? = $ac_status" >&5
+  echo "$as_me:48829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47860: \$? = $ac_status" >&5
+  echo "$as_me:48835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -47871,21 +48846,21 @@ done
 
 fi
 
-echo "$as_me:47874: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:48849: 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:47881: checking if curses supports fancy attributes" >&5
+echo "$as_me:48856: 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 47888 "configure"
+#line 48863 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -47903,16 +48878,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47909: \$? = $ac_status" >&5
+  echo "$as_me:48884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47915: \$? = $ac_status" >&5
+  echo "$as_me:48890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -47924,14 +48899,14 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:47927: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:48902: 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:47934: checking for function curses_version" >&5
+echo "$as_me:48909: 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
@@ -47941,7 +48916,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 47944 "configure"
+#line 48919 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -47954,15 +48929,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:47957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47960: \$? = $ac_status" >&5
+  echo "$as_me:48935: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:47962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47965: \$? = $ac_status" >&5
+  echo "$as_me:48940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -47977,7 +48952,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:47980: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:48955: 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
@@ -47985,14 +48960,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:47988: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:48963: 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 47995 "configure"
+#line 48970 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48011,16 +48986,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48017: \$? = $ac_status" >&5
+  echo "$as_me:48992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48023: \$? = $ac_status" >&5
+  echo "$as_me:48998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -48032,10 +49007,10 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48035: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:49010: 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:48038: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:49013: 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
@@ -48045,14 +49020,14 @@ EOF
 fi
 fi
 
-echo "$as_me:48048: checking if curses supports color attributes" >&5
+echo "$as_me:49023: 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 48055 "configure"
+#line 49030 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48072,16 +49047,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48078: \$? = $ac_status" >&5
+  echo "$as_me:49053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48084: \$? = $ac_status" >&5
+  echo "$as_me:49059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_color_curses=yes
 else
@@ -48093,7 +49068,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48096: result: $cf_cv_color_curses" >&5
+echo "$as_me:49071: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test "$cf_cv_color_curses" = yes ; then
 
@@ -48117,23 +49092,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:48120: checking for $ac_header" >&5
+echo "$as_me:49095: 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 48126 "configure"
+#line 49101 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:48130: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:49105: \"$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:48136: \$? = $ac_status" >&5
+  echo "$as_me:49111: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48152,7 +49127,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48155: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:49130: 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
@@ -48169,10 +49144,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:48172: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:49147: 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 48175 "configure"
+#line 49150 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -48184,16 +49159,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48187: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48190: \$? = $ac_status" >&5
+  echo "$as_me:49165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48196: \$? = $ac_status" >&5
+  echo "$as_me:49171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -48201,7 +49176,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48204 "configure"
+#line 49179 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -48215,16 +49190,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49193: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48221: \$? = $ac_status" >&5
+  echo "$as_me:49196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48227: \$? = $ac_status" >&5
+  echo "$as_me:49202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -48240,12 +49215,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:48243: result: $termios_bad" >&5
+	echo "$as_me:49218: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:48248: checking declaration of size-change" >&5
+echo "$as_me:49223: 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
@@ -48266,7 +49241,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48269 "configure"
+#line 49244 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -48316,16 +49291,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48322: \$? = $ac_status" >&5
+  echo "$as_me:49297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48328: \$? = $ac_status" >&5
+  echo "$as_me:49303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -48344,7 +49319,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:48347: result: $cf_cv_sizechange" >&5
+echo "$as_me:49322: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -48362,14 +49337,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:48365: checking if ttytype is declared in curses library" >&5
+echo "$as_me:49340: 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 48372 "configure"
+#line 49347 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -48381,16 +49356,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48387: \$? = $ac_status" >&5
+  echo "$as_me:49362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48393: \$? = $ac_status" >&5
+  echo "$as_me:49368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -48402,7 +49377,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48405: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:49380: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test "$cf_cv_have_ttytype" = yes &&
 cat >>confdefs.h <<\EOF
@@ -48411,14 +49386,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:48414: checking if curses supports wide characters" >&5
+echo "$as_me:49389: 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 48421 "configure"
+#line 49396 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -48437,16 +49412,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48443: \$? = $ac_status" >&5
+  echo "$as_me:49418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48449: \$? = $ac_status" >&5
+  echo "$as_me:49424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -48457,7 +49432,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:48460: result: $cf_cv_widec_curses" >&5
+echo "$as_me:49435: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -48467,14 +49442,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:48470: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:49445: 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 48477 "configure"
+#line 49452 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -48488,23 +49463,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49466: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48494: \$? = $ac_status" >&5
+  echo "$as_me:49469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48500: \$? = $ac_status" >&5
+  echo "$as_me:49475: \$? = $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 48507 "configure"
+#line 49482 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -48519,16 +49494,16 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49497: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48525: \$? = $ac_status" >&5
+  echo "$as_me:49500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48531: \$? = $ac_status" >&5
+  echo "$as_me:49506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -48540,7 +49515,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:48543: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:49518: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -48563,7 +49538,7 @@ fi
 
 	fi
 
-echo "$as_me:48566: checking definition to turn on extended curses functions" >&5
+echo "$as_me:49541: checking definition to turn on extended curses functions" >&5
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -48571,7 +49546,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48574 "configure"
+#line 49549 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -48603,16 +49578,16 @@ make an error	/* prefer to fall-through on the second checks */
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48609: \$? = $ac_status" >&5
+  echo "$as_me:49584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48615: \$? = $ac_status" >&5
+  echo "$as_me:49590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -48622,7 +49597,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48625 "configure"
+#line 49600 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -48647,16 +49622,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48653: \$? = $ac_status" >&5
+  echo "$as_me:49628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48659: \$? = $ac_status" >&5
+  echo "$as_me:49634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -48670,7 +49645,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:48673: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:49648: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -48682,7 +49657,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:48685: checking for term.h" >&5
+echo "$as_me:49660: 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
@@ -48703,7 +49678,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48706 "configure"
+#line 49681 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48717,16 +49692,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48723: \$? = $ac_status" >&5
+  echo "$as_me:49698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48729: \$? = $ac_status" >&5
+  echo "$as_me:49704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -48745,7 +49720,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48748 "configure"
+#line 49723 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48763,16 +49738,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48769: \$? = $ac_status" >&5
+  echo "$as_me:49744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48775: \$? = $ac_status" >&5
+  echo "$as_me:49750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -48787,7 +49762,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:48790: result: $cf_cv_term_header" >&5
+echo "$as_me:49765: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -48814,7 +49789,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:48817: checking for unctrl.h" >&5
+echo "$as_me:49792: 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
@@ -48835,7 +49810,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48838 "configure"
+#line 49813 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48849,16 +49824,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48855: \$? = $ac_status" >&5
+  echo "$as_me:49830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48861: \$? = $ac_status" >&5
+  echo "$as_me:49836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -48871,12 +49846,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:48874: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:49849: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:48879: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:49854: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -48932,10 +49907,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:48935: checking for ${cf_func}" >&5
+	echo "$as_me:49910: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:48938: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:49913: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -48944,7 +49919,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 48947 "configure"
+#line 49922 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -48977,16 +49952,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48983: \$? = $ac_status" >&5
+  echo "$as_me:49958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48989: \$? = $ac_status" >&5
+  echo "$as_me:49964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -49002,7 +49977,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:49005: result: $cf_result" >&5
+	echo "$as_me:49980: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -49019,13 +49994,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:49022: checking for $ac_func" >&5
+echo "$as_me:49997: 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 49028 "configure"
+#line 50003 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -49056,16 +50031,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49062: \$? = $ac_status" >&5
+  echo "$as_me:50037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49068: \$? = $ac_status" >&5
+  echo "$as_me:50043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -49075,7 +50050,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:49078: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:50053: 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
@@ -49089,12 +50064,12 @@ fi
 
 if test "$use_color_style" != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:49092: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50067: 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:49097: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50072: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -49102,7 +50077,7 @@ fi
 
 if test "$use_scrollbar" != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:49105: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:50080: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -49115,7 +50090,7 @@ fi
 
 # use rpath for libraries in unusual places
 
-echo "$as_me:49118: checking if rpath-hack should be disabled" >&5
+echo "$as_me:50093: 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.
@@ -49133,22 +50108,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:49136: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:50111: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:49141: checking for updated LDFLAGS" >&5
+echo "$as_me:50116: 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:49144: result: maybe" >&5
+	echo "$as_me:50119: 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:49151: checking for $ac_word" >&5
+echo "$as_me:50126: 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
@@ -49163,7 +50138,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:49166: found $ac_dir/$ac_word" >&5
+echo "$as_me:50141: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -49171,10 +50146,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:49174: result: $cf_ldd_prog" >&5
+  echo "$as_me:50149: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:49177: result: no" >&5
+  echo "$as_me:50152: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -49188,7 +50163,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 49191 "configure"
+#line 50166 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -49200,16 +50175,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49206: \$? = $ac_status" >&5
+  echo "$as_me:50181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49212: \$? = $ac_status" >&5
+  echo "$as_me:50187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -49237,7 +50212,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:49240: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:50215: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -49249,11 +50224,11 @@ echo "${as_me:-configure}:49240: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:49252: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50227: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:49256: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50231: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -49290,7 +50265,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:49293: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50268: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -49303,11 +50278,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:49306: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50281: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:49310: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50285: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -49344,7 +50319,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:49347: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50322: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -49357,14 +50332,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:49360: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50335: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:49364: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50339: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:49367: result: no" >&5
+	echo "$as_me:50342: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -49479,7 +50454,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:49482: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:50457: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -49658,7 +50633,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:49661: error: ambiguous option: $1
+    { { echo "$as_me:50636: 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;}
@@ -49677,7 +50652,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:49680: error: unrecognized option: $1
+  -*) { { echo "$as_me:50655: 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;}
@@ -49730,7 +50705,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
-  *) { { echo "$as_me:49733: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:50708: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -49940,6 +50915,7 @@ s,@GZIP@,$GZIP,;t t
 s,@UNCOMPRESS@,$UNCOMPRESS,;t t
 s,@UNZIP@,$UNZIP,;t t
 s,@BZIP2@,$BZIP2,;t t
+s,@BROTLI@,$BROTLI,;t t
 s,@TAR@,$TAR,;t t
 s,@TAR_UP_OPTIONS@,$TAR_UP_OPTIONS,;t t
 s,@TAR_DOWN_OPTIONS@,$TAR_DOWN_OPTIONS,;t t
@@ -50092,7 +51068,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:50095: creating $ac_file" >&5
+    { echo "$as_me:51071: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -50110,7 +51086,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:50113: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51089: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -50123,7 +51099,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:50126: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51102: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -50139,7 +51115,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:50142: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:51118: 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;}
@@ -50148,7 +51124,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:50151: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:51127: 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;}
@@ -50185,7 +51161,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:50188: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:51164: 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;}
@@ -50196,7 +51172,7 @@ $ac_seen" >&2;}
     ${EGREP-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:50199: WARNING: Some variables may not be substituted:
+      { echo "$as_me:51175: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -50245,7 +51221,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:50248: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:51224: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -50256,7 +51232,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:50259: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51235: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -50269,7 +51245,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:50272: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51248: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -50387,7 +51363,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:50390: $ac_file is unchanged" >&5
+      { echo "$as_me:51366: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 7910a29f..fc698c34 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.340 2021/11/05 00:11:32 tom Exp $
+dnl $LynxId: configure.in,v 1.341 2022/03/17 20:10:18 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -7,7 +7,7 @@ dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ---------------------------------------------------------------------------
-dnl Copyright 1997-2020,2021 by Thomas E. Dickey
+dnl Copyright 1997-2021,2022 by Thomas E. Dickey
 dnl
 dnl Permission to use, copy, modify, and distribute this software and its
 dnl documentation for any purpose and without fee is hereby granted,
@@ -1313,6 +1313,19 @@ if test ".$use_zlib" != ".no" ; then
 fi
 
 dnl --------------------------------------------------------------------------
+AC_MSG_CHECKING(if you want to use brotli decompression)
+AC_ARG_WITH(brotli,
+[  --with-brotli           use brotli decompression],
+	[use_brotli=$withval],
+	[use_brotli=no])
+AC_MSG_RESULT($use_brotli)
+
+if test ".$use_brotli" != ".no" ; then
+	CF_WITH_BROTLI($use_brotli)
+	test "x$cf_cv_find_linkage_brotlidec" = "xyes" && AC_DEFINE(USE_BROTLI,1,[Define to 1 if you want to use libbrotli decompression])
+fi
+
+dnl --------------------------------------------------------------------------
 CF_HELP_MESSAGE(
 Other Network Services:)
 
@@ -1459,6 +1472,7 @@ CF_PATH_PROG(GZIP,	gzip)
 CF_PATH_PROG(UNCOMPRESS,gunzip)
 CF_PATH_PROG(UNZIP,	unzip)
 CF_PATH_PROG(BZIP2,	bzip2)
+CF_PATH_PROG(BROTLI,	brotli)
 
 CF_PATH_PROG(TAR,	tar, pax gtar gnutar bsdtar star)
 CF_TAR_OPTIONS($TAR)
diff --git a/lynx.cfg b/lynx.cfg
index f0812a96..5e4ab246 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,4 +1,4 @@
-# $LynxId: lynx.cfg,v 1.326 2021/11/05 00:11:32 tom Exp $
+# $LynxId: lynx.cfg,v 1.327 2022/03/17 23:22:35 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
@@ -2409,6 +2409,7 @@ MINIMAL_COMMENTS:TRUE
 #	GZIP		For gzip
 #	COMPRESS	For compress
 #	BZIP2		For bzip2
+#	BROTLI		For brotli
 #	ALL		All of the above.
 #PREFERRED_ENCODING:all
 
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index 0ff5a56c..cf5226ad 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFWriter.c,v 1.119 2019/08/25 22:57:03 tom Exp $
+ * $LynxId: HTFWriter.c,v 1.120 2022/03/28 00:04:50 tom Exp $
  *
  *		FILE WRITER				HTFWrite.h
  *		===========
@@ -310,6 +310,21 @@ static void HTFWriter_free(HTStream *me)
 			path[len - 4] = '\0';
 			(void) remove(path);
 		    }
+		} else if (len > 3 && !strcasecomp(&path[len - 2], "br")) {
+#ifdef USE_BROTLI
+		    if (!skip_loadfile) {
+			use_zread = YES;
+		    } else
+#endif /* USE_BROTLI */
+		    {
+			char FIXME[1024];
+
+			sprintf(FIXME, "brotli -d -j -f %s", path);
+			path[len - 3] = '\0';
+			(void) remove(path);
+			system(FIXME);
+		    }
+		    CTRACE((tfp, "FIXME %s@%d\n", __FILE__, __LINE__));
 		} else if (len > 2 && !strcasecomp(&path[len - 1], "Z")) {
 		    path[len - 2] = '\0';
 		    (void) remove(path);
@@ -813,7 +828,7 @@ HTStream *HTSaveAndExecute(HTPresentation *pres,
     /*
      * Make command to delete file.
      */
-    me->remove_command = 0;
+    me->remove_command = NULL;
     HTAddParam(&(me->remove_command), REMOVE_COMMAND, 1, fnam);
     HTEndParam(&(me->remove_command), REMOVE_COMMAND, 1);
 
@@ -980,7 +995,7 @@ HTStream *HTSaveToFile(HTPresentation *pres,
     /*
      * Make command to delete file.
      */
-    ret_obj->remove_command = 0;
+    ret_obj->remove_command = NULL;
     HTAddParam(&(ret_obj->remove_command), REMOVE_COMMAND, 1, fnam);
     HTEndParam(&(ret_obj->remove_command), REMOVE_COMMAND, 1);
 
@@ -1156,6 +1171,13 @@ HTStream *HTCompressed(HTPresentation *pres,
 		    compress_suffix = "bz2";
 		}
 		break;
+	    case cftBrotli:
+		if ((program = HTGetProgramPath(ppBROTLI)) != NULL) {
+		    StrAllocCopy(uncompress_mask, program);
+		    StrAllocCat(uncompress_mask, " -d %s");
+		    compress_suffix = "br";
+		}
+		break;
 	    case cftCompress:
 		if ((program = HTGetProgramPath(ppUNCOMPRESS)) != NULL) {
 		    /*
@@ -1300,10 +1322,22 @@ HTStream *HTCompressed(HTPresentation *pres,
     /*
      * Make command to process file.  - FM
      */
-#ifdef USE_BZLIB
-    if (compress_suffix[0] == 'b'	/* must be bzip2 */
+#ifdef USE_BROTLI
+    if (compress_suffix[0] == 'b'	/* e.g., ".br" */
+	&& compress_suffix[1] == 'r'
 	&& !me->viewer_command) {
 	/*
+	 * We won't call brotli externally, so we don't need to supply a
+	 * command for it.
+	 */
+	StrAllocCopy(me->end_command, "");
+    } else
+#endif
+#ifdef USE_BZLIB
+	if (compress_suffix[0] == 'b'	/* must be bzip2 */
+	    && compress_suffix[1] == 'z'
+	    && !me->viewer_command) {
+	/*
 	 * We won't call bzip2 externally, so we don't need to supply a command
 	 * for it.
 	 */
@@ -1322,7 +1356,7 @@ HTStream *HTCompressed(HTPresentation *pres,
     } else
 #endif /* USE_ZLIB */
     {
-	me->end_command = 0;
+	me->end_command = NULL;
 	HTAddParam(&(me->end_command), uncompress_mask, 1, fnam);
 	HTEndParam(&(me->end_command), uncompress_mask, 1);
     }
@@ -1331,7 +1365,7 @@ HTStream *HTCompressed(HTPresentation *pres,
     /*
      * Make command to delete file.  - FM
      */
-    me->remove_command = 0;
+    me->remove_command = NULL;
     HTAddParam(&(me->remove_command), REMOVE_COMMAND, 1, fnam);
     HTEndParam(&(me->remove_command), REMOVE_COMMAND, 1);
 
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 9208d994..58c2f882 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.183 2021/07/05 21:17:42 tom Exp $ */
+/* $LynxId: LYOptions.c,v 1.184 2021/07/30 00:17:54 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <HTTP.h>		/* 'reloading' flag */
@@ -2490,6 +2490,9 @@ static OptValues encoding_values[] =
 #if defined(USE_BZLIB) || defined(BZIP2_PATH)
     {encodingBZIP2, N_("bzip2"), "encoding_bzip2"},
 #endif
+#if defined(USE_BROTLI) || defined(BROTLI_PATH)
+    {encodingBROTLI, N_("brotli"), "encoding_brotli"},
+#endif
     {encodingALL, N_("All"), "encoding_all"},
     END_OPTIONS
 };
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 18bc34cf..e4ab7962 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.199 2021/06/09 21:49:32 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.200 2021/07/29 22:52:55 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -1460,6 +1460,7 @@ static Config_Type Config_Table [] =
      PARSE_LST(RC_BROKEN_FTP_EPSV,      broken_ftp_epsv),
      PARSE_LST(RC_BROKEN_FTP_RETR,      broken_ftp_retr),
 #endif
+     PARSE_PRG(RC_BROTLI_PATH,          ppBROTLI),
      PARSE_PRG(RC_BZIP2_PATH,           ppBZIP2),
      PARSE_SET(RC_CASE_SENSITIVE_ALWAYS_ON, LYcase_sensitive),
      PARSE_FUN(RC_CHARACTER_SET,        character_set_fun),
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index 06b843a5..be089175 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYrcFile.c,v 1.105 2021/07/05 20:29:10 tom Exp $ */
+/* $LynxId: LYrcFile.c,v 1.106 2022/03/27 23:01:26 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <LYUtils.h>
@@ -120,6 +120,9 @@ Config_Enum tbl_preferred_encoding[] = {
 #if defined(USE_BZLIB) || defined(BZIP2_PATH)
     { "bzip2",		encodingBZIP2 },
 #endif
+#if defined(USE_BROTLI) || defined(BROTLI_PATH)
+    { "br",		encodingBROTLI },
+#endif
     { "all",		encodingALL },
     { NULL,		-1 }
 };
@@ -234,6 +237,7 @@ BOOL LYgetEnum(Config_Enum * table, const char *name,
 	    return TRUE;
 	}
     }
+    CTRACE((tfp, "LYgetEnum: no match found for \"%s\"\n", name));
     return FALSE;		/* no match */
 }
 
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index f23c87ff..1285a216 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYrcFile.h,v 1.58 2021/07/05 20:23:51 tom Exp $
+ * $LynxId: LYrcFile.h,v 1.59 2021/07/29 22:53:37 tom Exp $
  */
 #ifndef LYRCFILE_H
 #define LYRCFILE_H
@@ -33,6 +33,7 @@
 #define RC_BOOKMARK_FILE                "bookmark_file"
 #define RC_BROKEN_FTP_EPSV              "broken_ftp_epsv"
 #define RC_BROKEN_FTP_RETR              "broken_ftp_retr"
+#define RC_BROTLI_PATH                  "brotli_path"
 #define RC_BZIP2_PATH                   "bzip2_path"
 #define RC_CASE_SENSITIVE_ALWAYS_ON     "case_sensitive_always_on"
 #define RC_CASE_SENSITIVE_SEARCHING     "case_sensitive_searching"