snapshot of project "lynx", label v2-9-0dev_10l

11 files changed, 4374 insertions, 4031 deletions

diff --git a/CHANGES b/CHANGES
index 3ccd4265..9995e06f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
--- $LynxId: CHANGES,v 1.1119 2022/07/25 23:49:15 tom Exp $
+-- $LynxId: CHANGES,v 1.1120 2022/09/30 07:53:11 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2022-07-25 (2.9.0dev.11)
+2022-09-29 (2.9.0dev.11)
+* add some consistency-checks to dtd_util to make it easier to use -TD
 * improve formatting of bookmark file, e.g., to fix warnings by tidy -TD
 * correct workaround for asan2 report of overlapping strcpy (report by KH) -TD
 * amend fix for Debian #738121; URL-encoded "?" in HTFile.c corresponds to an
@@ -36,11 +37,11 @@ Changes since Lynx 2.8 release
   around "HeavyThing" server which does not follow RFC 2616 in treating field
   name as case insensitive (report/patch by Sylvain Bertrand)
 * improved several configure macros:
-  AM_WITH_NLS, CF_ADD_INCDIR, CF_CHECK_EXTERN_DATA, CF_DISABLE_ECHO,
-  CF_FIX_WARNINGS, CF_MAKEFLAGS, CF_NCURSES_CONFIG, CF_NCURSES_LIBS,
-  CF_PKG_CONFIG, CF_SIZECHANGE, CF_TRY_XOPEN_SOURCE, CF_WITH_PATH,
-  CF_XOPEN_SOURCE
-* update config.guess (2022-05-25), config.sub (2022-01-03)
+  AM_WITH_NLS, CF_ADD_INCDIR, CF_BUILD_CC, CF_CHECK_EXTERN_DATA,
+  CF_DISABLE_ECHO, CF_FIX_WARNINGS, CF_MAKEFLAGS, CF_MATH_LIB,
+  CF_NCURSES_CONFIG, CF_NCURSES_LIBS, CF_PKG_CONFIG, CF_PROG_LINT,
+  CF_SIZECHANGE, CF_TRY_XOPEN_SOURCE, CF_WITH_PATH, CF_XOPEN_SOURCE
+* update config.guess (2022-08-01), config.sub (2022-08-01)
 
 2021-10-24 (2.9.0dev.10)
 * several fixes for problems found using asan2 with fuzzer-generated data
diff --git a/WWW/Library/Implementation/dtd_util.c b/WWW/Library/Implementation/dtd_util.c
index cb783406..cf889989 100644
--- a/WWW/Library/Implementation/dtd_util.c
+++ b/WWW/Library/Implementation/dtd_util.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: dtd_util.c,v 1.80 2021/07/23 00:23:04 tom Exp $
+ * $LynxId: dtd_util.c,v 1.89 2022/09/29 23:51:16 tom Exp $
  *
  * Given a SGML_dtd structure, write a corresponding flat file, or "C" source.
  * Given the flat-file, write the "C" source.
@@ -10,6 +10,7 @@
 #include <HTUtils.h>
 #include <HTMLDTD.h>
 #include <string.h>
+#include <stdarg.h>
 
 /*
  * Tweaks to build standalone.
@@ -42,6 +43,13 @@ FILE *TraceFP(void)
 
 #define ATTR_TYPE(name) { #name, name##_attr_list }
 
+#define MY_LIMIT		1024
+#define FMT_WS			"%[ \t\n]"
+#define FMT_NUM_ATTR_TYPES	"%d attr_types"
+#define FMT_NUM_ATTRS		"%d attributes:"
+#define FMT_ONE_ATTR		"%d:%d:%s"
+#define NUM_ONE_ATTR		4
+
 static const char alias_codes[] = "!@#$%^&*";
 
 #define DATA(name) { #name, Tgc_##name }
@@ -121,12 +129,34 @@ static const attr bgcolor_attr_list[] = {
 #undef T
 /* *INDENT-ON* */
 
+static const char *input_filename;
+static int input_lineno;
+
 static void failed(const char *s)
 {
+    if (input_lineno) {
+	int save = errno;
+
+	fprintf(stderr, "%s:%d ", input_filename, input_lineno);
+	errno = save;
+    }
     perror(s);
     exit(EXIT_FAILURE);
 }
 
+static void warning(const char *, ...) GCC_PRINTFLIKE(1, 2);
+
+static void warning(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    fprintf(stderr, "%s:%d: ", input_filename, input_lineno);
+    vfprintf(stderr, fmt, ap);
+    fputc('\n', stderr);
+    va_end(ap);
+}
+
 static void usage(void)
 {
     static const char *tbl[] =
@@ -222,6 +252,33 @@ static void PrintF(FILE *output, int width, const char *fmt, ...)
     fprintf(output, "%-*s", width, buffer);
 }
 
+static char *get_line(FILE *input)
+{
+    char temp[MY_LIMIT];
+    char *result = 0;
+
+    if (fgets(temp, (int) sizeof(temp), input) != 0) {
+	result = strdup(temp);
+	++input_lineno;
+    }
+    return result;
+}
+
+static int read_num_attr_types(FILE *input)
+{
+    char *next = get_line(input);
+    int count;
+    int code;
+    char trail[MY_LIMIT];
+
+    if (next == 0
+	|| (code = sscanf(next, FMT_NUM_ATTR_TYPES FMT_WS, &count, trail)) < 2
+	|| !count) {
+	warning("expected attr_types");
+    }
+    return count;
+}
+
 static int same_AttrList(AttrList a, AttrList b)
 {
     int result = 1;
@@ -322,7 +379,7 @@ static const char *DEF_name(const SGML_dtd * dtd, int which, unsigned alias)
     if (!strcmp(result, "OBJECT") && !first_object(dtd, which)) {
 	result = "OBJECT_PCDATA";
     } else if (alias) {
-	char buffer[1024];
+	char buffer[MY_LIMIT];
 
 	sprintf(buffer, "%s_%d", result, alias + 1);
 	result = strdup(buffer);
@@ -335,7 +392,7 @@ static const char *EXT_name(HTTag * tag)
     const char *result = tag->name;
 
     if (tag->alias) {
-	char buffer[1024];
+	char buffer[MY_LIMIT];
 
 	sprintf(buffer, "%s%c", result, alias_codes[tag->alias - 1]);
 	result = strdup(buffer);
@@ -743,6 +800,8 @@ static void dump_source(FILE *output, const SGML_dtd * dtd, int dtd_version)
 	    from_attr[from_size] = 0;
 
 	    if (list != 0) {
+		/* FIXME check if each remaining attribute is defined in XXX */
+
 		dump_src_AttrType(output, name, list, from_attr);
 		free(list);
 	    }
@@ -765,7 +824,7 @@ static void dump_source(FILE *output, const SGML_dtd * dtd, int dtd_version)
     NOTE("#undef T");
     NOTE("");
     NOTE("/* tag-names */");
-    /* FIXME - are these needed other than as parameters to macros? */
+    /* these may be needed as parameters to macros */
     for (j = 0; j <= dtd->number_of_tags; ++j) {
 	fprintf(output, "#undef %s\n", DEF_name(dtd, j, 0));
     }
@@ -923,19 +982,15 @@ static void dump_header(FILE *output, const SGML_dtd * dtd)
     fprintf(output, "#endif\t\t\t\t/* %s */\n", marker);
 }
 
-#define FMT_NUM_ATTRS "%d attributes:\n"
-#define FMT_ONE_ATTR  "%d:%d:%s\n"
-#define NUM_ONE_ATTR  3
-
 static void dump_flat_attrs(FILE *output,
 			    const attr * attributes,
 			    int number_of_attributes)
 {
     int n;
 
-    fprintf(output, "\t\t" FMT_NUM_ATTRS, number_of_attributes);
+    fprintf(output, "\t\t" FMT_NUM_ATTRS "\n", number_of_attributes);
     for (n = 0; n < number_of_attributes; ++n) {
-	fprintf(output, "\t\t\t" FMT_ONE_ATTR, n,
+	fprintf(output, "\t\t\t" FMT_ONE_ATTR "\n", n,
 #ifdef USE_PRETTYSRC
 		attributes[n].type,
 #else
@@ -951,7 +1006,7 @@ static void dump_flat_attr_types(FILE *output, const AttrType * attr_types)
     const AttrType *p = sorted_AttrTypes(attr_types);
     int number = len_AttrTypes(attr_types);
 
-    fprintf(output, "\t\t%d attr_types\n", number);
+    fprintf(output, "\t\t" FMT_NUM_ATTR_TYPES "\n", number);
 
     if (p != 0) {
 	while (p->name != 0) {
@@ -1087,7 +1142,7 @@ static void dump_flatfile(FILE *output, const SGML_dtd * dtd)
 	} else {
 	    count = len_AttrTypes(attr_types);
 	    qsort(attr_types, count, sizeof(*attr_types), compare_attr_types);
-	    fprintf(output, "%d attr_types\n", count);
+	    fprintf(output, FMT_NUM_ATTR_TYPES "\n", count);
 	    for (n = 0; n < count; ++n) {
 		fprintf(output, "\t%d:%s\n", n, attr_types[n].name);
 		dump_flat_attrs(output, attr_types[n].list,
@@ -1107,17 +1162,6 @@ static void dump_flatfile(FILE *output, const SGML_dtd * dtd)
 #endif
 }
 
-static char *get_line(FILE *input)
-{
-    char temp[1024];
-    char *result = 0;
-
-    if (fgets(temp, (int) sizeof(temp), input) != 0) {
-	result = strdup(temp);
-    }
-    return result;
-}
-
 #define LOAD(name) \
 	if (!strcmp(data, #name)) {\
 	    *theClass |= Tgc_##name; \
@@ -1163,16 +1207,16 @@ static int load_flat_TagClass(FILE *input, const char *name, TagClass * theClass
 		LOAD(same);
 		LOAD(DELlike);
 
-		fprintf(stderr, "Unexpected TagClass '%s'\n", data);
+		warning("Unexpected TagClass '%s'", data);
 		result = 0;
 		break;
 	    }
 	} else if (data) {
-	    fprintf(stderr, "load_flat_TagClass: '%s' vs '%s'\n", data, prefix);
+	    warning("load_flat_TagClass: '%s' vs '%s'", data, prefix);
 	}
 	free(next);
     } else {
-	fprintf(stderr, "Did not find contents\n");
+	warning("Did not find contents");
     }
     return result;
 }
@@ -1210,12 +1254,12 @@ static int load_flat_TagFlags(FILE *input, const char *name, TagFlags * flags)
 		LOAD(frecyc);
 		LOAD(nolyspcl);
 
-		fprintf(stderr, "Unexpected TagFlag '%s'\n", data);
+		warning("Unexpected TagFlag '%s'", data);
 		result = 0;
 		break;
 	    }
 	} else if (data) {
-	    fprintf(stderr, "load_flat_TagFlags: '%s' vs '%s'\n", data, prefix);
+	    warning("load_flat_TagFlags: '%s' vs '%s'", data, prefix);
 	}
 	free(next);
     }
@@ -1229,49 +1273,79 @@ static int load_flat_AttrList(FILE *input, AttrList * attrs, int *length)
     attr *attributes;
     int j, jcmp, code;
     int result = 1;
-    char name[1024];
+    char name[MY_LIMIT];
+    char *next;
+    char trail[MY_LIMIT];
 
 #ifdef USE_PRETTYSRC
     int atype;
 #endif
 
-    if (fscanf(input, FMT_NUM_ATTRS, length) == 1
+    next = get_line(input);
+    if (sscanf(next, FMT_NUM_ATTRS FMT_WS, length, trail) == 2
 	&& *length > 0
-	&& (attributes = typecallocn(attr, (size_t) (*length + 1))) != 0) {
+	&& (attributes = typecallocn(attr, *length + 1)) != 0) {
 	*attrs = attributes;
 	for (j = 0; j < *length; ++j) {
-	    code = fscanf(input, FMT_ONE_ATTR,
-			  &jcmp,
-			  &atype,
-			  name
-		);
-	    if (code == NUM_ONE_ATTR && (j == jcmp)) {
+	    next = get_line(input);
+	    code = sscanf(next, FMT_ONE_ATTR FMT_WS, &jcmp, &atype, name, trail);
+	    if (code == NUM_ONE_ATTR) {
+		if (j != jcmp)
+		    warning("resequence %s from %d to %d", name, jcmp, j);
 		attributes[j].name = strdup(name);
 #ifdef USE_PRETTYSRC
 		attributes[j].type = atype;
 #endif
 	    } else {
-		fprintf(stderr, "Did not find attributes\n");
+		warning("Did not find attributes");
 		result = 0;
 		break;
 	    }
 	}
-	if (*length > 1)
+	if (*length > 1 && result)
 	    qsort(attributes, *length, sizeof(attributes[0]), compare_attr);
+    } else {
+	warning("expected attribute count:\n%s", next);
     }
     return result;
 }
 
+/* find the given attribute in the list of attr_types */
+static int find_attribute(const char *attribute, const AttrType * attr_types)
+{
+    int j, k;
+    int found = -1;
+
+    for (j = 0; attr_types[j].name; ++j) {
+	AttrList list = attr_types[j].list;
+
+	for (k = 0; list[k].name; ++k) {
+	    if (!strcmp(attribute, list[k].name)) {
+		if (found >= 0)
+		    warning("attribute %s is in attr_types %s and %s",
+			    attribute,
+			    attr_types[found].name,
+			    attr_types[j].name);
+		found = j;
+	    }
+	}
+    }
+    return (found >= 0);
+}
+
 static int load_flat_HTTag(FILE *input, HTTag * tag, AttrType * allTypes)
 {
     int result = 0;
     unsigned ncmp = 0;
-    char name[1024];
+    char name[MY_LIMIT];
+    char trail[MY_LIMIT];
+    char *next;
     int code;
     int j;
 
-    code = fscanf(input, "%d:%s\n", &ncmp, name);
-    if (code == 2) {
+    next = get_line(input);
+    code = sscanf(next, "%d:%s" FMT_WS, &ncmp, name, trail);
+    if (code == 3) {
 	result = 1;
 	tag->alias = 0;
 	tag->aliases = 0;
@@ -1293,10 +1367,11 @@ static int load_flat_HTTag(FILE *input, HTTag * tag, AttrType * allTypes)
 	tag->name_len = strlen(tag->name);
 #endif
 #ifdef USE_JUSTIFY_ELTS
-	if (fscanf(input, "%s\n", name) == 1) {
+	next = get_line(input);
+	if (sscanf(next, "%s" FMT_WS, name, trail) == 2) {
 	    tag->can_justify = !strcmp(name, "justify");
 	} else {
-	    fprintf(stderr, "Did not find can_justify\n");
+	    warning("Did not find can_justify");
 	    result = 0;
 	}
 #endif
@@ -1306,42 +1381,57 @@ static int load_flat_HTTag(FILE *input, HTTag * tag, AttrType * allTypes)
 	if (result) {
 	    AttrType *myTypes;
 	    int k, count;
-	    char *next = get_line(input);
 
-	    if (next != 0
-		&& sscanf(next, "%d attr_types\n", &count)
-		&& (myTypes = typecallocn(AttrType, (size_t) (count + 1)))
-		!= 0) {
+	    if ((count = read_num_attr_types(input)) > 0
+		&& (myTypes = typecallocn(AttrType, count + 1)) != 0) {
 		tag->attr_types = myTypes;
 		for (k = 0; k < count; ++k) {
 		    next = get_line(input);
 		    if (next != 0
-			&& sscanf(next, "%s\n", name)) {
+			&& sscanf(next, "%s" FMT_WS, name, trail)) {
+			int found = -1;
+
 			for (j = 0; allTypes[j].name != 0; ++j) {
 			    if (!strcmp(allTypes[j].name, name)) {
 				myTypes[k].name = strdup(name);
 				myTypes[k].list = allTypes[j].list;
+				found = k;
 				break;
 			    }
 			}
+			if (found < 0) {
+			    warning("not found in attr_types: %s", name);
+			    continue;
+			}
 		    } else {
 			result = 0;
 			break;
 		    }
 		}
-		if (result && count > 1)
-		    qsort(myTypes, count, sizeof(myTypes[0]), compare_attr_types);
+		if (result) {
+		    if (count > 1)
+			qsort(myTypes,
+			      count,
+			      sizeof(myTypes[0]),
+			      compare_attr_types);
+		    for (k = 0; k < tag->number_of_attributes; ++k) {
+			if (!find_attribute(tag->attributes[k].name, tag->attr_types)) {
+			    warning("%s attribute %s not found in attr_types",
+				    tag->name, tag->attributes[k].name);
+			}
+		    }
+		}
 	    }
 	}
 	if (result) {
-	    char *next = get_line(input);
 
+	    next = get_line(input);
 	    if (next != 0
-		&& sscanf(next, "\t\tcontents: %s\n", name)) {
+		&& sscanf(next, "\t\tcontents: %s" FMT_WS, name, trail)) {
 		tag->contents = s2SGMLContent(name);
 		free(next);
 	    } else {
-		fprintf(stderr, "Did not find contents\n");
+		warning("Did not find contents");
 		result = 0;
 	    }
 	}
@@ -1367,7 +1457,7 @@ static int load_flat_HTTag(FILE *input, HTTag * tag, AttrType * allTypes)
 	    result = load_flat_TagFlags(input, "flags", &(tag->flags));
 	}
     } else {
-	fprintf(stderr, "load_flat_HTTag error\n");
+	warning("load_flat_HTTag error");
     }
     return result;
 }
@@ -1376,14 +1466,19 @@ static int load_flat_AttrType(FILE *input, AttrType * types, size_t ncmp)
 {
     int result = 0;
     int ntst;
-    char name[1024];
+    char name[MY_LIMIT];
+    char trail[MY_LIMIT];
+    char *next;
 
-    if (fscanf(input, "%d:%s\n", &ntst, name) == 2
+    next = get_line(input);
+    if (sscanf(next, "%d:%s" FMT_WS, &ntst, name, trail) == 3
 	&& (ntst == (int) ncmp)) {
 	result = 1;
 	types->name = strdup(name);
 	if (!load_flat_AttrList(input, &(types->list), &ntst))
 	    result = 0;
+    } else {
+	warning("expected a tag:\n%s", next);
     }
     return result;
 }
@@ -1404,27 +1499,31 @@ static SGML_dtd *load_flatfile(FILE *input)
 {
     AttrType *attr_types = 0;
     SGML_dtd *result = 0;
+    char *next;
     size_t n;
     int number_of_attrs = 0;
     int number_of_tags = 0;
     HTTag *tag;
     int code;
+    char trail[MY_LIMIT];
 
-    code = fscanf(input, "%d attr_types\n", &number_of_attrs);
-    if (code
-	&& number_of_attrs
-	&& (attr_types = typecallocn(AttrType, number_of_attrs + 1)) != 0) {
-	for (n = 0; n < (size_t) number_of_attrs; ++n) {
-	    if (!load_flat_AttrType(input, attr_types + n, n)) {
-		break;
-	    }
+    if ((number_of_attrs = read_num_attr_types(input)) <= 0) {
+	;
+    } else if ((attr_types = typecallocn(AttrType, number_of_attrs + 1)) == 0) {
+	failed("calloc attr_types");
+    }
+
+    for (n = 0; n < (size_t) number_of_attrs; ++n) {
+	if (!load_flat_AttrType(input, attr_types + n, n)) {
+	    break;
 	}
     }
 
-    code = fscanf(input, "%d tags\n", &number_of_tags);
-    if (code == 1) {
+    next = get_line(input);
+    code = sscanf(next, "%d tags" FMT_WS, &number_of_tags, trail);
+    if (code == 2) {
 	if ((result = typecalloc(SGML_dtd)) != 0
-	    && (result->tags = typecallocn(HTTag, (number_of_tags + 2))) != 0) {
+	    && (result->tags = typecallocn(HTTag, number_of_tags + 2)) != 0) {
 	    for (n = 0; n < (size_t) number_of_tags; ++n) {
 		if (load_flat_HTTag(input, &(result->tags[n]), attr_types)) {
 		    result->number_of_tags = (n + 1);
@@ -1444,12 +1543,14 @@ static SGML_dtd *load_flatfile(FILE *input)
 		}
 	    }
 	    if (tag == 0) {
-		fprintf(stderr, "Did not find OBJECT tag\n");
+		warning("Did not find OBJECT tag");
 		result = 0;
 	    } else {
 		qsort(result->tags, number_of_tags, sizeof(HTTag), compare_tags);
 	    }
 	}
+    } else {
+	warning("expected tag count:\n%s", next);
     }
     return result;
 }
@@ -1566,6 +1667,9 @@ int main(int argc, char *argv[])
     FILE *input = stdin;
     FILE *output = stdout;
 
+    input_filename = "<builtin>";
+    input_lineno = 0;
+
     while ((ch = getopt(argc, argv, GETOPT)) != -1) {
 	switch (ch) {
 	case 'c':
@@ -1576,7 +1680,7 @@ int main(int argc, char *argv[])
 	    break;
 	case 'l':
 	    l_option = TRUE;
-	    input = fopen(optarg, "r");
+	    input = fopen((input_filename = optarg), "r");
 	    if (input == 0)
 		failed(optarg);
 	    break;
diff --git a/WWW/Library/Implementation/hdr_HTMLDTD.h b/WWW/Library/Implementation/hdr_HTMLDTD.h
index 662624ad..21888d07 100644
--- a/WWW/Library/Implementation/hdr_HTMLDTD.h
+++ b/WWW/Library/Implementation/hdr_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: hdr_HTMLDTD.h,v 1.24 2021/07/16 00:40:16 tom Exp $ */
+/* $LynxId: hdr_HTMLDTD.h,v 1.25 2022/09/28 22:26:32 tom Exp $ */
 #ifndef hdr_HTMLDTD_H
 #define hdr_HTMLDTD_H 1
 
@@ -315,18 +315,19 @@ extern "C" {
 #define HTML_BUTTON_CLEAR         2
 #define HTML_BUTTON_DIR           3
 #define HTML_BUTTON_DISABLED      4
-#define HTML_BUTTON_ID            5
-#define HTML_BUTTON_LANG          6
-#define HTML_BUTTON_NAME          7
-#define HTML_BUTTON_ONBLUR        8
-#define HTML_BUTTON_ONFOCUS       9
-#define HTML_BUTTON_READONLY     10
-#define HTML_BUTTON_STYLE        11
-#define HTML_BUTTON_TABINDEX     12
-#define HTML_BUTTON_TITLE        13
-#define HTML_BUTTON_TYPE         14
-#define HTML_BUTTON_VALUE        15
-#define HTML_BUTTON_ATTRIBUTES   16
+#define HTML_BUTTON_FORMACTION    5
+#define HTML_BUTTON_ID            6
+#define HTML_BUTTON_LANG          7
+#define HTML_BUTTON_NAME          8
+#define HTML_BUTTON_ONBLUR        9
+#define HTML_BUTTON_ONFOCUS      10
+#define HTML_BUTTON_READONLY     11
+#define HTML_BUTTON_STYLE        12
+#define HTML_BUTTON_TABINDEX     13
+#define HTML_BUTTON_TITLE        14
+#define HTML_BUTTON_TYPE         15
+#define HTML_BUTTON_VALUE        16
+#define HTML_BUTTON_ATTRIBUTES   17
 
 #define HTML_CAPTION_ACCESSKEY    0
 #define HTML_CAPTION_ALIGN        1
diff --git a/WWW/Library/Implementation/src0_HTMLDTD.h b/WWW/Library/Implementation/src0_HTMLDTD.h
index b800e183..a2daa4f3 100644
--- a/WWW/Library/Implementation/src0_HTMLDTD.h
+++ b/WWW/Library/Implementation/src0_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: src0_HTMLDTD.h,v 1.48 2021/07/23 21:36:23 tom Exp $ */
+/* $LynxId: src0_HTMLDTD.h,v 1.49 2022/09/30 00:04:06 tom Exp $ */
 #ifndef src_HTMLDTD_H0
 #define src_HTMLDTD_H0 1
 
@@ -401,6 +401,7 @@ static const attr BUTTON_attr_list[] = {
 	{ "ACCESSKEY"     T(N) },
 	{ "CLEAR"         T(N) },
 	{ "DISABLED"      T(N) },
+	{ "FORMACTION"    T(N) },
 	{ "NAME"          T(N) },
 	{ "ONBLUR"        T(N) },
 	{ "ONFOCUS"       T(N) },
@@ -1403,6 +1404,7 @@ static const attr BUTTON_attr[] = {     /* BUTTON attributes */
 	{ "CLEAR"         T(N) },
 	{ "DIR"           T(N) },
 	{ "DISABLED"      T(N) },
+	{ "FORMACTION"    T(N) },
 	{ "ID"            T(i) },
 	{ "LANG"          T(N) },
 	{ "NAME"          T(N) },
diff --git a/WWW/Library/Implementation/src0_HTMLDTD.txt b/WWW/Library/Implementation/src0_HTMLDTD.txt
index 1350da2a..a3c51d94 100644
--- a/WWW/Library/Implementation/src0_HTMLDTD.txt
+++ b/WWW/Library/Implementation/src0_HTMLDTD.txt
@@ -119,17 +119,18 @@
 			1:0:CLEAR
 			2:0:NOWRAP
 	15:BUTTON
-		10 attributes:
+		11 attributes:
 			0:0:ACCESSKEY
 			1:0:CLEAR
 			2:0:DISABLED
-			3:0:NAME
-			4:0:ONBLUR
-			5:0:ONFOCUS
-			6:0:READONLY
-			7:0:TABINDEX
-			8:0:TYPE
-			9:0:VALUE
+			3:0:FORMACTION
+			4:0:NAME
+			5:0:ONBLUR
+			6:0:ONFOCUS
+			7:0:READONLY
+			8:0:TABINDEX
+			9:0:TYPE
+			10:0:VALUE
 	16:CAPTION
 		2 attributes:
 			0:0:ACCESSKEY
@@ -1116,23 +1117,24 @@
 		flags: endO
 	23:BUTTON
 		justify
-		16 attributes:
+		17 attributes:
 			0:0:ACCESSKEY
 			1:4:CLASS
 			2:0:CLEAR
 			3:0:DIR
 			4:0:DISABLED
-			5:1:ID
-			6:0:LANG
-			7:0:NAME
-			8:0:ONBLUR
-			9:0:ONFOCUS
-			10:0:READONLY
-			11:0:STYLE
-			12:0:TABINDEX
-			13:0:TITLE
-			14:0:TYPE
-			15:0:VALUE
+			5:0:FORMACTION
+			6:1:ID
+			7:0:LANG
+			8:0:NAME
+			9:0:ONBLUR
+			10:0:ONFOCUS
+			11:0:READONLY
+			12:0:STYLE
+			13:0:TABINDEX
+			14:0:TITLE
+			15:0:TYPE
+			16:0:VALUE
 		4 attr_types
 			core
 			events
diff --git a/WWW/Library/Implementation/src1_HTMLDTD.h b/WWW/Library/Implementation/src1_HTMLDTD.h
index 38af2d5a..39c95942 100644
--- a/WWW/Library/Implementation/src1_HTMLDTD.h
+++ b/WWW/Library/Implementation/src1_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: src1_HTMLDTD.h,v 1.48 2021/07/23 21:36:23 tom Exp $ */
+/* $LynxId: src1_HTMLDTD.h,v 1.49 2022/09/30 00:03:49 tom Exp $ */
 #ifndef src_HTMLDTD_H1
 #define src_HTMLDTD_H1 1
 
@@ -401,6 +401,7 @@ static const attr BUTTON_attr_list[] = {
 	{ "ACCESSKEY"     T(N) },
 	{ "CLEAR"         T(N) },
 	{ "DISABLED"      T(N) },
+	{ "FORMACTION"    T(N) },
 	{ "NAME"          T(N) },
 	{ "ONBLUR"        T(N) },
 	{ "ONFOCUS"       T(N) },
@@ -1403,6 +1404,7 @@ static const attr BUTTON_attr[] = {     /* BUTTON attributes */
 	{ "CLEAR"         T(N) },
 	{ "DIR"           T(N) },
 	{ "DISABLED"      T(N) },
+	{ "FORMACTION"    T(N) },
 	{ "ID"            T(i) },
 	{ "LANG"          T(N) },
 	{ "NAME"          T(N) },
diff --git a/WWW/Library/Implementation/src1_HTMLDTD.txt b/WWW/Library/Implementation/src1_HTMLDTD.txt
index 839d3e5f..df1521b9 100644
--- a/WWW/Library/Implementation/src1_HTMLDTD.txt
+++ b/WWW/Library/Implementation/src1_HTMLDTD.txt
@@ -119,17 +119,18 @@
 			1:0:CLEAR
 			2:0:NOWRAP
 	15:BUTTON
-		10 attributes:
+		11 attributes:
 			0:0:ACCESSKEY
 			1:0:CLEAR
 			2:0:DISABLED
-			3:0:NAME
-			4:0:ONBLUR
-			5:0:ONFOCUS
-			6:0:READONLY
-			7:0:TABINDEX
-			8:0:TYPE
-			9:0:VALUE
+			3:0:FORMACTION
+			4:0:NAME
+			5:0:ONBLUR
+			6:0:ONFOCUS
+			7:0:READONLY
+			8:0:TABINDEX
+			9:0:TYPE
+			10:0:VALUE
 	16:CAPTION
 		2 attributes:
 			0:0:ACCESSKEY
@@ -1116,23 +1117,24 @@
 		flags: endO
 	23:BUTTON
 		justify
-		16 attributes:
+		17 attributes:
 			0:0:ACCESSKEY
 			1:4:CLASS
 			2:0:CLEAR
 			3:0:DIR
 			4:0:DISABLED
-			5:1:ID
-			6:0:LANG
-			7:0:NAME
-			8:0:ONBLUR
-			9:0:ONFOCUS
-			10:0:READONLY
-			11:0:STYLE
-			12:0:TABINDEX
-			13:0:TITLE
-			14:0:TYPE
-			15:0:VALUE
+			5:0:FORMACTION
+			6:1:ID
+			7:0:LANG
+			8:0:NAME
+			9:0:ONBLUR
+			10:0:ONFOCUS
+			11:0:READONLY
+			12:0:STYLE
+			13:0:TABINDEX
+			14:0:TITLE
+			15:0:TYPE
+			16:0:VALUE
 		4 attr_types
 			core
 			events
diff --git a/aclocal.m4 b/aclocal.m4
index f0edbdfc..9dada1c3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.307 2022/03/17 19:59:12 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.309 2022/09/30 08:07:15 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>
@@ -1207,7 +1207,7 @@ if test "$cf_cv_bool_defs" = no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 9 updated: 2021/01/02 09:31:20
+dnl CF_BUILD_CC version: 10 updated: 2022/09/24 16:36:41
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -1273,7 +1273,30 @@ if test "$cross_compiling" = yes ; then
 
 	: ${BUILD_CC:='${CC}'}
 
-	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+	AC_MSG_CHECKING(if the build-compiler "$BUILD_CC" works)
+
+	cf_save_crossed=$cross_compiling
+	cf_save_ac_link=$ac_link
+	cross_compiling=no
+	ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&AS_MESSAGE_LOG_FD'
+
+	AC_TRY_RUN([#include <stdio.h>
+		int main(int argc, char *argv[])
+		{
+			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
+		}
+	],
+		cf_ok_build_cc=yes,
+		cf_ok_build_cc=no,
+		cf_ok_build_cc=unknown)
+
+	cross_compiling=$cf_save_crossed
+	ac_link=$cf_save_ac_link
+
+	AC_MSG_RESULT($cf_ok_build_cc)
+
+	if test "$cf_ok_build_cc" != yes
+	then
 		AC_MSG_ERROR([Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler.])
 	fi
@@ -4148,7 +4171,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MATH_LIB version: 10 updated: 2020/12/31 18:40:20
+dnl CF_MATH_LIB version: 11 updated: 2022/07/27 19:01:48
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
@@ -4158,18 +4181,42 @@ AC_DEFUN([CF_MATH_LIB],
 AC_CACHE_CHECK(if -lm needed for math functions,
 	cf_cv_need_libm,[
 	AC_TRY_LINK([
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <math.h>
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
 	],
 	[double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],
 	[cf_cv_need_libm=no],
 	[cf_cv_need_libm=yes])])
+
 if test "$cf_cv_need_libm" = yes
 then
-ifelse($1,,[
-	CF_ADD_LIB(m)
-],[$1=-lm])
+
+	cf_save_LIBS="$LIBS"
+	LIBS="$LIBS -lm"
+	AC_CACHE_CHECK(if -lm is available for math functions,
+	cf_cv_have_libm,[
+	AC_TRY_LINK([
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
+	],
+	[double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],
+	[cf_cv_have_libm=yes],
+	[cf_cv_have_libm=no])])
+	LIBS="$cf_save_LIBS"
+
+	if test "$cf_cv_have_libm" = yes
+	then
+		ifelse($1,,[CF_ADD_LIB(m)],[$1=-lm])
+	fi
+else
+	cf_cv_have_libm=yes
+fi
+
+if test "$cf_cv_have_libm" = yes
+then
+	AC_DEFINE(HAVE_MATH_FUNCS,1,[Define to 1 if math functions are available])
 fi
 ])
 dnl ---------------------------------------------------------------------------
@@ -5344,7 +5391,7 @@ AC_SUBST(PROG_EXT)
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37
+dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
@@ -5355,6 +5402,7 @@ case "x$LINT" in
 	;;
 esac
 AC_SUBST(LINT_OPTS)
+AC_SUBST(LINT_LIBS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PROG_RANLIB version: 1 updated: 2009/01/01 20:15:22
@@ -6701,34 +6749,20 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TRY_XOPEN_SOURCE version: 3 updated: 2021/08/28 15:20:37
+dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16
 dnl -------------------
 dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
 dnl can define it successfully.
 AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
 AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-	AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-],[
-#ifndef _XOPEN_SOURCE
-make an error
-#endif],
+	AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
 	[cf_cv_xopen_source=no],
 	[cf_save="$CPPFLAGS"
 	 CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE)
-	 AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-],[
-#ifdef _XOPEN_SOURCE
-make an error
-#endif],
-	[cf_cv_xopen_source=no],
-	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
-	CPPFLAGS="$cf_save"
+	 AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
+		[cf_cv_xopen_source=no],
+		[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
+		CPPFLAGS="$cf_save"
 	])
 ])
 
@@ -7211,6 +7245,8 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_BROTLI version: 1 updated: 2022/03/17 15:59:12
+dnl --------------
 dnl Check for Brotli decoder library
 dnl
 dnl $1 = optional path for headers/library
@@ -7457,7 +7493,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 59 updated: 2021/08/28 15:20:37
+dnl CF_XOPEN_SOURCE version: 61 updated: 2022/09/30 04:05:55
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -7508,7 +7544,7 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|linux*gnueabi|linux*gnueabihf|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
@@ -7557,7 +7593,13 @@ case "$host_os" in
 	;;
 (*)
 	CF_TRY_XOPEN_SOURCE
+	cf_save_xopen_cppflags="$CPPFLAGS"
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
+	# Some of these niche implementations use copy/paste, double-check...
+	CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
+	AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
+		AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
+		CPPFLAGS="$cf_save_xopen_cppflags"])
 	;;
 esac
 
@@ -8059,6 +8101,26 @@ define([CF__SSL_HEAD],[
 #endif
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF__XOPEN_SOURCE_BODY version: 1 updated: 2022/09/10 15:17:35
+dnl ---------------------
+dnl body of test when test-compiling for _XOPEN_SOURCE check
+define([CF__XOPEN_SOURCE_BODY],
+[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+])
+dnl ---------------------------------------------------------------------------
+dnl CF__XOPEN_SOURCE_HEAD version: 1 updated: 2022/09/10 15:17:03
+dnl ---------------------
+dnl headers to include when test-compiling for _XOPEN_SOURCE check
+define([CF__XOPEN_SOURCE_HEAD],
+[
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+])
+dnl ---------------------------------------------------------------------------
 dnl jm_GLIBC21 version: 4 updated: 2015/05/10 19:52:14
 dnl ----------
 dnl Inserted as requested by gettext 0.10.40
diff --git a/config.guess b/config.guess
index 1817bdce..a419d864 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-05-25'
+timestamp='2022-08-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1036,7 +1036,7 @@ EOF
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
-    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
     m32r*:Linux:*:*)
diff --git a/config.sub b/config.sub
index dba16e84..fbaa37f2 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-01-03'
+timestamp='2022-08-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1207,7 +1207,7 @@ case $cpu-$vendor in
 			| k1om \
 			| le32 | le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 | loongarchx32 \
+			| loongarch32 | loongarch64 \
 			| m32c | m32r | m32rle \
 			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
diff --git a/configure b/configure
index 4ff984c0..f22e62a5 100755
--- a/configure
+++ b/configure
@@ -3749,8 +3749,57 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
-		{ { echo "$as_me:3753: error: Cross-build requires two compilers.
+	echo "$as_me:3752: checking if the build-compiler \"$BUILD_CC\" works" >&5
+echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+
+	cf_save_crossed=$cross_compiling
+	cf_save_ac_link=$ac_link
+	cross_compiling=no
+	ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&5'
+
+	if test "$cross_compiling" = yes; then
+  cf_ok_build_cc=unknown
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3764 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+		int main(int argc, char *argv[])
+		{
+			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
+		}
+
+_ACEOF
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:3774: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3777: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:3779: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3782: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_ok_build_cc=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_ok_build_cc=no
+fi
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+
+	cross_compiling=$cf_save_crossed
+	ac_link=$cf_save_ac_link
+
+	echo "$as_me:3797: result: $cf_ok_build_cc" >&5
+echo "${ECHO_T}$cf_ok_build_cc" >&6
+
+	if test "$cf_ok_build_cc" != yes
+	then
+		{ { echo "$as_me:3802: 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;}
@@ -3771,7 +3820,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:3774: checking for $ac_word" >&5
+echo "$as_me:3823: 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
@@ -3786,7 +3835,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:3789: found $ac_dir/$ac_word" >&5
+echo "$as_me:3838: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3794,10 +3843,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3797: result: $RANLIB" >&5
+  echo "$as_me:3846: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3800: result: no" >&5
+  echo "$as_me:3849: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3806,7 +3855,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:3809: checking for $ac_word" >&5
+echo "$as_me:3858: 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
@@ -3821,7 +3870,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:3824: found $ac_dir/$ac_word" >&5
+echo "$as_me:3873: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3830,10 +3879,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3833: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3882: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3836: result: no" >&5
+  echo "$as_me:3885: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3845,7 +3894,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:3848: checking for $ac_word" >&5
+echo "$as_me:3897: 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
@@ -3860,7 +3909,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:3863: found $ac_dir/$ac_word" >&5
+echo "$as_me:3912: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3868,10 +3917,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3871: result: $AR" >&5
+  echo "$as_me:3920: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3874: result: no" >&5
+  echo "$as_me:3923: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3880,7 +3929,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:3883: checking for $ac_word" >&5
+echo "$as_me:3932: 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
@@ -3895,7 +3944,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:3898: found $ac_dir/$ac_word" >&5
+echo "$as_me:3947: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3904,10 +3953,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3907: result: $ac_ct_AR" >&5
+  echo "$as_me:3956: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3910: result: no" >&5
+  echo "$as_me:3959: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3916,7 +3965,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3919: checking for options to update archives" >&5
+echo "$as_me:3968: 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
@@ -3953,13 +4002,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 3956 "configure"
+#line 4005 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:3959: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:4008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3962: \$? = $ac_status" >&5
+  echo "$as_me:4011: \$? = $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
@@ -3970,7 +4019,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:3973: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4022: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -3980,7 +4029,7 @@ echo "${as_me:-configure}:3973: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:3983: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4032: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -3991,7 +4040,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:3994: checking if you want to see long compiling messages" >&5
+echo "$as_me:4043: 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.
@@ -4025,7 +4074,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:4028: result: $enableval" >&5
+echo "$as_me:4077: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -4035,7 +4084,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:4038: checking if you want to check memory-leaks" >&5
+echo "$as_me:4087: 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.
@@ -4052,7 +4101,7 @@ else
 	with_leak_checks=no
 
 fi;
-echo "$as_me:4055: result: $with_leak_checks" >&5
+echo "$as_me:4104: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -4062,7 +4111,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:4065: checking if you want to enable debug-code" >&5
+echo "$as_me:4114: 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.
@@ -4079,7 +4128,7 @@ else
 	with_debug=no
 
 fi;
-echo "$as_me:4082: result: $with_debug" >&5
+echo "$as_me:4131: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case "$host_os" in
@@ -4104,7 +4153,7 @@ else
 	esac
 fi
 
-echo "$as_me:4107: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:4156: 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.
@@ -4121,14 +4170,14 @@ else
 	with_trace=yes
 
 fi;
-echo "$as_me:4124: result: $with_trace" >&5
+echo "$as_me:4173: 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:4131: checking if you want verbose trace code" >&5
+echo "$as_me:4180: 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.
@@ -4145,7 +4194,7 @@ else
 	with_vertrace=no
 
 fi;
-echo "$as_me:4148: result: $with_vertrace" >&5
+echo "$as_me:4197: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test "$with_vertrace" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4154,7 +4203,7 @@ EOF
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:4157: checking for X" >&5
+	echo "$as_me:4206: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -4258,17 +4307,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 4261 "configure"
+#line 4310 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:4265: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4314: \"$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:4271: \$? = $ac_status" >&5
+  echo "$as_me:4320: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4301,7 +4350,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4304 "configure"
+#line 4353 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -4313,16 +4362,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4319: \$? = $ac_status" >&5
+  echo "$as_me:4368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4325: \$? = $ac_status" >&5
+  echo "$as_me:4374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -4360,7 +4409,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:4363: result: $have_x" >&5
+  echo "$as_me:4412: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -4370,7 +4419,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:4373: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:4422: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -4397,11 +4446,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:4400: checking whether -R must be followed by a space" >&5
+      echo "$as_me:4449: 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 4404 "configure"
+#line 4453 "configure"
 #include "confdefs.h"
 
 int
@@ -4413,16 +4462,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4419: \$? = $ac_status" >&5
+  echo "$as_me:4468: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4425: \$? = $ac_status" >&5
+  echo "$as_me:4474: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -4432,13 +4481,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:4435: result: no" >&5
+	echo "$as_me:4484: 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 4441 "configure"
+#line 4490 "configure"
 #include "confdefs.h"
 
 int
@@ -4450,16 +4499,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4456: \$? = $ac_status" >&5
+  echo "$as_me:4505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4462: \$? = $ac_status" >&5
+  echo "$as_me:4511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -4469,11 +4518,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:4472: result: yes" >&5
+	  echo "$as_me:4521: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:4476: result: neither works" >&5
+	  echo "$as_me:4525: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -4493,7 +4542,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 4496 "configure"
+#line 4545 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4512,22 +4561,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4518: \$? = $ac_status" >&5
+  echo "$as_me:4567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4524: \$? = $ac_status" >&5
+  echo "$as_me:4573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:4530: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:4579: 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
@@ -4535,7 +4584,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4538 "configure"
+#line 4587 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4554,16 +4603,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4560: \$? = $ac_status" >&5
+  echo "$as_me:4609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4566: \$? = $ac_status" >&5
+  echo "$as_me:4615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -4574,14 +4623,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4577: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:4626: 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:4584: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:4633: 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
@@ -4589,7 +4638,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4592 "configure"
+#line 4641 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4608,16 +4657,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4614: \$? = $ac_status" >&5
+  echo "$as_me:4663: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4620: \$? = $ac_status" >&5
+  echo "$as_me:4669: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -4628,7 +4677,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4631: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:4680: 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"
@@ -4647,13 +4696,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:4650: checking for gethostbyname" >&5
+    echo "$as_me:4699: 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 4656 "configure"
+#line 4705 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4684,16 +4733,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4690: \$? = $ac_status" >&5
+  echo "$as_me:4739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4696: \$? = $ac_status" >&5
+  echo "$as_me:4745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -4703,11 +4752,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4706: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:4755: 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:4710: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:4759: 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
@@ -4715,7 +4764,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4718 "configure"
+#line 4767 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4734,16 +4783,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4740: \$? = $ac_status" >&5
+  echo "$as_me:4789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4746: \$? = $ac_status" >&5
+  echo "$as_me:4795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -4754,14 +4803,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4757: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:4806: 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:4764: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:4813: 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
@@ -4769,7 +4818,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4772 "configure"
+#line 4821 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4788,16 +4837,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4794: \$? = $ac_status" >&5
+  echo "$as_me:4843: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4800: \$? = $ac_status" >&5
+  echo "$as_me:4849: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -4808,7 +4857,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4811: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:4860: 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"
@@ -4824,13 +4873,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:4827: checking for connect" >&5
+    echo "$as_me:4876: 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 4833 "configure"
+#line 4882 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4861,16 +4910,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4867: \$? = $ac_status" >&5
+  echo "$as_me:4916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4873: \$? = $ac_status" >&5
+  echo "$as_me:4922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -4880,11 +4929,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4883: result: $ac_cv_func_connect" >&5
+echo "$as_me:4932: 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:4887: checking for connect in -lsocket" >&5
+      echo "$as_me:4936: 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
@@ -4892,7 +4941,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4895 "configure"
+#line 4944 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4911,16 +4960,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4917: \$? = $ac_status" >&5
+  echo "$as_me:4966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4923: \$? = $ac_status" >&5
+  echo "$as_me:4972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -4931,7 +4980,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4934: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:4983: 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"
@@ -4940,13 +4989,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:4943: checking for remove" >&5
+    echo "$as_me:4992: 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 4949 "configure"
+#line 4998 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4977,16 +5026,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4983: \$? = $ac_status" >&5
+  echo "$as_me:5032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4989: \$? = $ac_status" >&5
+  echo "$as_me:5038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -4996,11 +5045,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4999: result: $ac_cv_func_remove" >&5
+echo "$as_me:5048: 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:5003: checking for remove in -lposix" >&5
+      echo "$as_me:5052: 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
@@ -5008,7 +5057,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5011 "configure"
+#line 5060 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5027,16 +5076,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5033: \$? = $ac_status" >&5
+  echo "$as_me:5082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5039: \$? = $ac_status" >&5
+  echo "$as_me:5088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -5047,7 +5096,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5050: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:5099: 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"
@@ -5056,13 +5105,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:5059: checking for shmat" >&5
+    echo "$as_me:5108: 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 5065 "configure"
+#line 5114 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5093,16 +5142,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5099: \$? = $ac_status" >&5
+  echo "$as_me:5148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5105: \$? = $ac_status" >&5
+  echo "$as_me:5154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -5112,11 +5161,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5115: result: $ac_cv_func_shmat" >&5
+echo "$as_me:5164: 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:5119: checking for shmat in -lipc" >&5
+      echo "$as_me:5168: 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
@@ -5124,7 +5173,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5127 "configure"
+#line 5176 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5143,16 +5192,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5149: \$? = $ac_status" >&5
+  echo "$as_me:5198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5155: \$? = $ac_status" >&5
+  echo "$as_me:5204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -5163,7 +5212,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5166: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:5215: 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"
@@ -5181,7 +5230,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:5184: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:5233: 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
@@ -5189,7 +5238,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5192 "configure"
+#line 5241 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5208,16 +5257,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5214: \$? = $ac_status" >&5
+  echo "$as_me:5263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5220: \$? = $ac_status" >&5
+  echo "$as_me:5269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -5228,7 +5277,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5231: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:5280: 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"
@@ -5240,7 +5289,7 @@ fi
 
 fi
 
-echo "$as_me:5243: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:5292: 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.
@@ -5257,17 +5306,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:5260: result: $enable_stdnoreturn" >&5
+echo "$as_me:5309: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:5264: checking for C11 _Noreturn feature" >&5
+echo "$as_me:5313: 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 5270 "configure"
+#line 5319 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5284,16 +5333,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5290: \$? = $ac_status" >&5
+  echo "$as_me:5339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5296: \$? = $ac_status" >&5
+  echo "$as_me:5345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -5304,7 +5353,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5307: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:5356: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -5360,16 +5409,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5363: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5412: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5368: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5417: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5372: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5421: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5408,16 +5457,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5411: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5460: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5416: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5465: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5420: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5469: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5456,23 +5505,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5459: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5508: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5464: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5513: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5468: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5517: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:5475: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:5524: 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.
@@ -5489,7 +5538,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:5492: result: $enable_warnings" >&5
+echo "$as_me:5541: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -5512,10 +5561,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:5515: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:5564: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 5518 "${as_me:-configure}"
+#line 5567 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -5564,12 +5613,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:5567: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5570: \$? = $ac_status" >&5
+  echo "$as_me:5619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5572: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:5621: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -5647,7 +5696,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5650 "configure"
+#line 5699 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5662,26 +5711,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5668: \$? = $ac_status" >&5
+  echo "$as_me:5717: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5674: \$? = $ac_status" >&5
+  echo "$as_me:5723: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:5677: checking for X11/Xt const-feature" >&5
+echo "$as_me:5726: 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 5684 "configure"
+#line 5733 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -5698,16 +5747,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5750: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5704: \$? = $ac_status" >&5
+  echo "$as_me:5753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5710: \$? = $ac_status" >&5
+  echo "$as_me:5759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -5722,7 +5771,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5725: result: $cf_cv_const_x_string" >&5
+echo "$as_me:5774: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -5751,7 +5800,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 5754 "${as_me:-configure}"
+#line 5803 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -5767,7 +5816,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:5770: checking for $CC warning options..." >&5
+	{ echo "$as_me:5819: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -5783,12 +5832,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:5786: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5789: \$? = $ac_status" >&5
+  echo "$as_me:5838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5791: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5840: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -5796,7 +5845,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:5799: checking for $CC warning options..." >&5
+	{ echo "$as_me:5848: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -5819,12 +5868,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:5822: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5825: \$? = $ac_status" >&5
+  echo "$as_me:5874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5827: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5876: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -5832,7 +5881,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}:5835: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5884: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5842,7 +5891,7 @@ echo "${as_me:-configure}:5835: 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}:5845: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5894: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5859,7 +5908,7 @@ fi
 
 fi
 
-echo "$as_me:5862: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:5911: 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.
@@ -5881,7 +5930,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:5884: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:5933: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -5995,23 +6044,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:5998: checking for dbmalloc.h" >&5
+	echo "$as_me:6047: 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 6004 "configure"
+#line 6053 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6008: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6057: \"$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:6014: \$? = $ac_status" >&5
+  echo "$as_me:6063: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6030,11 +6079,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6033: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:6082: 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:6037: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:6086: 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
@@ -6042,7 +6091,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6045 "configure"
+#line 6094 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6061,16 +6110,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6067: \$? = $ac_status" >&5
+  echo "$as_me:6116: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6073: \$? = $ac_status" >&5
+  echo "$as_me:6122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -6081,7 +6130,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6084: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:6133: 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
@@ -6096,7 +6145,7 @@ fi
 
 fi
 
-echo "$as_me:6099: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:6148: 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.
@@ -6118,7 +6167,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:6121: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:6170: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6232,23 +6281,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:6235: checking for dmalloc.h" >&5
+	echo "$as_me:6284: 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 6241 "configure"
+#line 6290 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6245: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6294: \"$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:6251: \$? = $ac_status" >&5
+  echo "$as_me:6300: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6267,11 +6316,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6270: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:6319: 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:6274: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:6323: 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
@@ -6279,7 +6328,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6282 "configure"
+#line 6331 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6298,16 +6347,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6304: \$? = $ac_status" >&5
+  echo "$as_me:6353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6310: \$? = $ac_status" >&5
+  echo "$as_me:6359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -6318,7 +6367,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6321: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:6370: 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
@@ -6358,7 +6407,7 @@ case "$host_os" in
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:6361: checking for strcmp in -lc_s" >&5
+echo "$as_me:6410: 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
@@ -6366,7 +6415,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6369 "configure"
+#line 6418 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6385,16 +6434,16 @@ strcmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6391: \$? = $ac_status" >&5
+  echo "$as_me:6440: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6397: \$? = $ac_status" >&5
+  echo "$as_me:6446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -6405,7 +6454,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6408: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:6457: 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
@@ -6585,14 +6634,14 @@ fi
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in
 	(cc|*/cc)
-		{ echo "$as_me:6588: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:6637: 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:6595: checking for $ac_word" >&5
+echo "$as_me:6644: 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
@@ -6607,7 +6656,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:6610: found $ac_dir/$ac_word" >&5
+echo "$as_me:6659: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6615,10 +6664,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:6618: result: $CC" >&5
+  echo "$as_me:6667: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:6621: result: no" >&5
+  echo "$as_me:6670: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6641,23 +6690,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:6644: checking for $ac_header" >&5
+echo "$as_me:6693: 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 6650 "configure"
+#line 6699 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6654: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6703: \"$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:6660: \$? = $ac_status" >&5
+  echo "$as_me:6709: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6676,7 +6725,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6679: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6728: 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
@@ -6704,23 +6753,23 @@ done
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6707: checking for $ac_header" >&5
+echo "$as_me:6756: 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 6713 "configure"
+#line 6762 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6717: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6766: \"$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:6723: \$? = $ac_status" >&5
+  echo "$as_me:6772: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6739,7 +6788,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6742: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6791: 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
@@ -6766,13 +6815,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:6769: checking \$CFLAGS variable" >&5
+echo "$as_me:6818: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:6773: result: broken" >&5
+	echo "$as_me:6822: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6775: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:6824: 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=
@@ -6880,18 +6929,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:6883: result: ok" >&5
+	echo "$as_me:6932: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:6888: checking \$CC variable" >&5
+echo "$as_me:6937: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:6892: result: broken" >&5
+	echo "$as_me:6941: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6894: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:6943: 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/[ ]*[ ]-[^ ].*//'`
@@ -7008,24 +7057,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:7011: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:7060: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7015: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7064: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7019: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7068: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:7023: result: ok" >&5
+	echo "$as_me:7072: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:7028: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:7077: 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
@@ -7149,7 +7198,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7152 "configure"
+#line 7201 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -7170,16 +7219,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7222: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7176: \$? = $ac_status" >&5
+  echo "$as_me:7225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7182: \$? = $ac_status" >&5
+  echo "$as_me:7231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -7192,7 +7241,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:7195: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:7244: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -7306,7 +7355,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:7309: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:7358: 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
@@ -7326,7 +7375,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:7329: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:7378: 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
@@ -7338,7 +7387,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 7341 "configure"
+#line 7390 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7358,16 +7407,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7410: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7364: \$? = $ac_status" >&5
+  echo "$as_me:7413: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7370: \$? = $ac_status" >&5
+  echo "$as_me:7419: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7377,16 +7426,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7383: \$? = $ac_status" >&5
+  echo "$as_me:7432: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7389: \$? = $ac_status" >&5
+  echo "$as_me:7438: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -7400,13 +7449,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:7403: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:7452: 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:7409: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:7458: 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
@@ -7414,7 +7463,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7417 "configure"
+#line 7466 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7434,16 +7483,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7440: \$? = $ac_status" >&5
+  echo "$as_me:7489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7446: \$? = $ac_status" >&5
+  echo "$as_me:7495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7452,7 +7501,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7455 "configure"
+#line 7504 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -7473,16 +7522,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7479: \$? = $ac_status" >&5
+  echo "$as_me:7528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7485: \$? = $ac_status" >&5
+  echo "$as_me:7534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -7493,7 +7542,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7496: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:7545: 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
 
@@ -7503,7 +7552,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:7506: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:7555: 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
@@ -7511,7 +7560,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7514 "configure"
+#line 7563 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7531,16 +7580,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7534: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7537: \$? = $ac_status" >&5
+  echo "$as_me:7586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7543: \$? = $ac_status" >&5
+  echo "$as_me:7592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7549,7 +7598,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7552 "configure"
+#line 7601 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -7570,16 +7619,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7576: \$? = $ac_status" >&5
+  echo "$as_me:7625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7582: \$? = $ac_status" >&5
+  echo "$as_me:7631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -7590,7 +7639,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7593: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:7642: 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
 
@@ -7603,7 +7652,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:7606: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:7655: 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
@@ -7611,7 +7660,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7614 "configure"
+#line 7663 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7623,16 +7672,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7629: \$? = $ac_status" >&5
+  echo "$as_me:7678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7635: \$? = $ac_status" >&5
+  echo "$as_me:7684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7641,7 +7690,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7644 "configure"
+#line 7693 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -7654,16 +7703,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7660: \$? = $ac_status" >&5
+  echo "$as_me:7709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7666: \$? = $ac_status" >&5
+  echo "$as_me:7715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -7674,7 +7723,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7677: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:7726: 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
 
@@ -7688,13 +7737,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:7691: checking for fseeko" >&5
+echo "$as_me:7740: 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 7697 "configure"
+#line 7746 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7706,16 +7755,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7712: \$? = $ac_status" >&5
+  echo "$as_me:7761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7718: \$? = $ac_status" >&5
+  echo "$as_me:7767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -7725,7 +7774,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7728: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:7777: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -7764,14 +7813,14 @@ fi
 
 	fi
 
-	echo "$as_me:7767: checking whether to use struct dirent64" >&5
+	echo "$as_me:7816: 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 7774 "configure"
+#line 7823 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -7794,16 +7843,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7800: \$? = $ac_status" >&5
+  echo "$as_me:7849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7806: \$? = $ac_status" >&5
+  echo "$as_me:7855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -7814,7 +7863,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7817: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:7866: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -7826,20 +7875,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:7829: checking for PATH separator" >&5
+	echo "$as_me:7878: 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:7836: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:7885: 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:7842: checking for $ac_word" >&5
+echo "$as_me:7891: 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
@@ -7866,17 +7915,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:7869: result: $MSGINIT" >&5
+  echo "$as_me:7918: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:7872: result: no" >&5
+  echo "$as_me:7921: 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}:7879: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:7928: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -7885,7 +7934,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:7888: checking for $ac_word" >&5
+echo "$as_me:7937: 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
@@ -7900,7 +7949,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:7903: found $ac_dir/$ac_word" >&5
+echo "$as_me:7952: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7908,10 +7957,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:7911: result: $RANLIB" >&5
+  echo "$as_me:7960: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:7914: result: no" >&5
+  echo "$as_me:7963: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7920,7 +7969,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:7923: checking for $ac_word" >&5
+echo "$as_me:7972: 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
@@ -7935,7 +7984,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:7938: found $ac_dir/$ac_word" >&5
+echo "$as_me:7987: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7944,10 +7993,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:7947: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:7996: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:7950: result: no" >&5
+  echo "$as_me:7999: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7956,13 +8005,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:7959: checking for ANSI C header files" >&5
+echo "$as_me:8008: 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 7965 "configure"
+#line 8014 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7970,13 +8019,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7973: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8022: \"$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:7979: \$? = $ac_status" >&5
+  echo "$as_me:8028: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7998,7 +8047,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 8001 "configure"
+#line 8050 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -8016,7 +8065,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 8019 "configure"
+#line 8068 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -8037,7 +8086,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8040 "configure"
+#line 8089 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -8063,15 +8112,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8115: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8069: \$? = $ac_status" >&5
+  echo "$as_me:8118: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8074: \$? = $ac_status" >&5
+  echo "$as_me:8123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8084,7 +8133,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:8087: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8136: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -8094,7 +8143,7 @@ EOF
 
 fi
 
-echo "$as_me:8097: checking for inline" >&5
+echo "$as_me:8146: 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
@@ -8102,7 +8151,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8105 "configure"
+#line 8154 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -8111,16 +8160,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8163: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8117: \$? = $ac_status" >&5
+  echo "$as_me:8166: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8123: \$? = $ac_status" >&5
+  echo "$as_me:8172: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -8131,7 +8180,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8134: result: $ac_cv_c_inline" >&5
+echo "$as_me:8183: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8152,28 +8201,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:8155: checking for $ac_header" >&5
+echo "$as_me:8204: 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 8161 "configure"
+#line 8210 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8170: \$? = $ac_status" >&5
+  echo "$as_me:8219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8176: \$? = $ac_status" >&5
+  echo "$as_me:8225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -8183,7 +8232,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8186: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8235: 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
@@ -8193,13 +8242,13 @@ EOF
 fi
 done
 
-echo "$as_me:8196: checking for off_t" >&5
+echo "$as_me:8245: 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 8202 "configure"
+#line 8251 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8214,16 +8263,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8220: \$? = $ac_status" >&5
+  echo "$as_me:8269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8226: \$? = $ac_status" >&5
+  echo "$as_me:8275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -8233,7 +8282,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8236: result: $ac_cv_type_off_t" >&5
+echo "$as_me:8285: 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
   :
@@ -8245,13 +8294,13 @@ EOF
 
 fi
 
-echo "$as_me:8248: checking for size_t" >&5
+echo "$as_me:8297: 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 8254 "configure"
+#line 8303 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8266,16 +8315,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8318: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8272: \$? = $ac_status" >&5
+  echo "$as_me:8321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8278: \$? = $ac_status" >&5
+  echo "$as_me:8327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -8285,7 +8334,7 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8288: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8337: 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
   :
@@ -8299,13 +8348,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:8302: checking for working alloca.h" >&5
+echo "$as_me:8351: 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 8308 "configure"
+#line 8357 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -8317,16 +8366,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8323: \$? = $ac_status" >&5
+  echo "$as_me:8372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8329: \$? = $ac_status" >&5
+  echo "$as_me:8378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -8336,7 +8385,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8339: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:8388: 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
 
@@ -8346,13 +8395,13 @@ EOF
 
 fi
 
-echo "$as_me:8349: checking for alloca" >&5
+echo "$as_me:8398: 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 8355 "configure"
+#line 8404 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -8384,16 +8433,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8390: \$? = $ac_status" >&5
+  echo "$as_me:8439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8396: \$? = $ac_status" >&5
+  echo "$as_me:8445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -8403,7 +8452,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8406: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8455: 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
@@ -8424,13 +8473,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:8427: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8476: 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 8433 "configure"
+#line 8482 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8448,18 +8497,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8451: result: $ac_cv_os_cray" >&5
+echo "$as_me:8500: 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:8456: checking for $ac_func" >&5
+echo "$as_me:8505: 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 8462 "configure"
+#line 8511 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8490,16 +8539,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8496: \$? = $ac_status" >&5
+  echo "$as_me:8545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8502: \$? = $ac_status" >&5
+  echo "$as_me:8551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8509,7 +8558,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8512: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8561: 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
 
@@ -8523,7 +8572,7 @@ fi
   done
 fi
 
-echo "$as_me:8526: checking stack direction for C alloca" >&5
+echo "$as_me:8575: 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
@@ -8532,7 +8581,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8535 "configure"
+#line 8584 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -8555,15 +8604,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8561: \$? = $ac_status" >&5
+  echo "$as_me:8610: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8566: \$? = $ac_status" >&5
+  echo "$as_me:8615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8575,7 +8624,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8578: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8627: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8587,23 +8636,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:8590: checking for $ac_header" >&5
+echo "$as_me:8639: 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 8596 "configure"
+#line 8645 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8600: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8649: \"$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:8606: \$? = $ac_status" >&5
+  echo "$as_me:8655: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8622,7 +8671,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8625: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8674: 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
@@ -8635,13 +8684,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8638: checking for $ac_func" >&5
+echo "$as_me:8687: 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 8644 "configure"
+#line 8693 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8672,16 +8721,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8678: \$? = $ac_status" >&5
+  echo "$as_me:8727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8684: \$? = $ac_status" >&5
+  echo "$as_me:8733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8691,7 +8740,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8694: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8743: 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
@@ -8701,7 +8750,7 @@ EOF
 fi
 done
 
-echo "$as_me:8704: checking for working mmap" >&5
+echo "$as_me:8753: 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
@@ -8710,7 +8759,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8713 "configure"
+#line 8762 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -8837,15 +8886,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8843: \$? = $ac_status" >&5
+  echo "$as_me:8892: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8848: \$? = $ac_status" >&5
+  echo "$as_me:8897: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -8857,7 +8906,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8860: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:8909: 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
 
@@ -8868,13 +8917,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:8871: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:8920: 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 8877 "configure"
+#line 8926 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -8894,7 +8943,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8897: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:8946: 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"
@@ -8907,7 +8956,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:8910: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:8959: 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
@@ -8924,23 +8973,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:8927: checking for $ac_header" >&5
+echo "$as_me:8976: 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 8933 "configure"
+#line 8982 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8937: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8986: \"$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:8943: \$? = $ac_status" >&5
+  echo "$as_me:8992: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8959,7 +9008,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8962: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9011: 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
@@ -8974,13 +9023,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:8977: checking for $ac_func" >&5
+echo "$as_me:9026: 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 8983 "configure"
+#line 9032 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9011,16 +9060,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9017: \$? = $ac_status" >&5
+  echo "$as_me:9066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9023: \$? = $ac_status" >&5
+  echo "$as_me:9072: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9030,7 +9079,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9033: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:9082: 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
@@ -9081,7 +9130,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9084 "configure"
+#line 9133 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9093,16 +9142,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9099: \$? = $ac_status" >&5
+  echo "$as_me:9148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9105: \$? = $ac_status" >&5
+  echo "$as_me:9154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9119,7 +9168,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}:9122: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9171: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9165,7 +9214,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9168 "configure"
+#line 9217 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9177,16 +9226,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9229: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9183: \$? = $ac_status" >&5
+  echo "$as_me:9232: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9189: \$? = $ac_status" >&5
+  echo "$as_me:9238: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9203,7 +9252,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}:9206: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9255: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9221,7 +9270,7 @@ echo "${as_me:-configure}:9206: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:9224: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9273: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9246,7 +9295,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}:9249: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9298: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9275,7 +9324,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}:9278: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9327: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9284,7 +9333,7 @@ echo "${as_me:-configure}:9278: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:9287: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9336: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9295,7 +9344,7 @@ esac
 
 fi;
 
-  echo "$as_me:9298: checking for iconv" >&5
+  echo "$as_me:9347: 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
@@ -9306,12 +9355,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:9309: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9358: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9314 "configure"
+#line 9363 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9330,16 +9379,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9336: \$? = $ac_status" >&5
+  echo "$as_me:9385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9342: \$? = $ac_status" >&5
+  echo "$as_me:9391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9353,7 +9402,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9356 "configure"
+#line 9405 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9372,16 +9421,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9378: \$? = $ac_status" >&5
+  echo "$as_me:9427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9384: \$? = $ac_status" >&5
+  echo "$as_me:9433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9398,9 +9447,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:9401: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:9450: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:9403: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9452: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9491,7 +9540,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}:9494: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9543: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -9499,7 +9548,7 @@ echo "${as_me:-configure}:9494: testing ... testing $cf_cv_header_path_iconv ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9502 "configure"
+#line 9551 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9518,21 +9567,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9524: \$? = $ac_status" >&5
+  echo "$as_me:9573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9530: \$? = $ac_status" >&5
+  echo "$as_me:9579: \$? = $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}:9535: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9584: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9550,7 +9599,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:9553: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9602: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -9625,13 +9674,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}:9628: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9677: 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 9634 "configure"
+#line 9683 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9650,21 +9699,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9656: \$? = $ac_status" >&5
+  echo "$as_me:9705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9662: \$? = $ac_status" >&5
+  echo "$as_me:9711: \$? = $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}:9667: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9716: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -9704,7 +9753,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:9707: result: $am_cv_func_iconv" >&5
+echo "$as_me:9756: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -9713,14 +9762,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:9716: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:9765: 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 9723 "configure"
+#line 9772 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9745,16 +9794,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9751: \$? = $ac_status" >&5
+  echo "$as_me:9800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9757: \$? = $ac_status" >&5
+  echo "$as_me:9806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -9764,7 +9813,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:9767: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:9816: 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
@@ -9809,7 +9858,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9812 "configure"
+#line 9861 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9821,16 +9870,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9827: \$? = $ac_status" >&5
+  echo "$as_me:9876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9833: \$? = $ac_status" >&5
+  echo "$as_me:9882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9847,7 +9896,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}:9850: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9899: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9886,7 +9935,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}:9889: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9938: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9897,13 +9946,13 @@ fi
     fi
   fi
 
-echo "$as_me:9900: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:9949: 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 9906 "configure"
+#line 9955 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -9915,16 +9964,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9921: \$? = $ac_status" >&5
+  echo "$as_me:9970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9927: \$? = $ac_status" >&5
+  echo "$as_me:9976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -9935,7 +9984,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9938: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:9987: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -9946,13 +9995,13 @@ EOF
 	fi
 
    if test "$ac_cv_header_locale_h" = yes; then
-	echo "$as_me:9949: checking for LC_MESSAGES" >&5
+	echo "$as_me:9998: 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 9955 "configure"
+#line 10004 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -9964,16 +10013,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9970: \$? = $ac_status" >&5
+  echo "$as_me:10019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9976: \$? = $ac_status" >&5
+  echo "$as_me:10025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -9983,7 +10032,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9986: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:10035: 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
 
@@ -9993,7 +10042,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:9996: checking whether NLS is requested" >&5
+   echo "$as_me:10045: 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.
@@ -10003,7 +10052,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:10006: result: $USE_NLS" >&5
+  echo "$as_me:10055: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -10017,7 +10066,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:10020: checking whether included gettext is requested" >&5
+    echo "$as_me:10069: 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.
@@ -10027,13 +10076,13 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:10030: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:10079: 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:10036: checking for $ac_word" >&5
+echo "$as_me:10085: 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
@@ -10060,16 +10109,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:10063: result: $MSGFMT" >&5
+  echo "$as_me:10112: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:10066: result: no" >&5
+  echo "$as_me:10115: 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:10072: checking for $ac_word" >&5
+echo "$as_me:10121: 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
@@ -10086,7 +10135,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:10089: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10138: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10098,17 +10147,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:10101: result: $GMSGFMT" >&5
+  echo "$as_me:10150: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:10104: result: no" >&5
+  echo "$as_me:10153: 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:10111: checking for $ac_word" >&5
+echo "$as_me:10160: 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
@@ -10135,10 +10184,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:10138: result: $XGETTEXT" >&5
+  echo "$as_me:10187: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:10141: result: no" >&5
+  echo "$as_me:10190: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10276,12 +10325,12 @@ fi
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:10279: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10328: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10284 "configure"
+#line 10333 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10303,16 +10352,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10309: \$? = $ac_status" >&5
+  echo "$as_me:10358: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10315: \$? = $ac_status" >&5
+  echo "$as_me:10364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10326,7 +10375,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10329 "configure"
+#line 10378 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10348,16 +10397,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10354: \$? = $ac_status" >&5
+  echo "$as_me:10403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10360: \$? = $ac_status" >&5
+  echo "$as_me:10409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10374,9 +10423,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:10377: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:10426: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:10379: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10428: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10467,7 +10516,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}:10470: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10519: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -10475,7 +10524,7 @@ echo "${as_me:-configure}:10470: testing ... testing $cf_cv_header_path_intl ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10478 "configure"
+#line 10527 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10497,21 +10546,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10549: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10503: \$? = $ac_status" >&5
+  echo "$as_me:10552: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10509: \$? = $ac_status" >&5
+  echo "$as_me:10558: \$? = $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}:10514: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10563: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10529,7 +10578,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:10532: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10581: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -10604,13 +10653,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}:10607: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10656: 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 10613 "configure"
+#line 10662 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10632,21 +10681,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10638: \$? = $ac_status" >&5
+  echo "$as_me:10687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10644: \$? = $ac_status" >&5
+  echo "$as_me:10693: \$? = $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}:10649: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10698: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -10685,9 +10734,9 @@ else
 cf_cv_func_gettext=no
 fi
 
-      echo "$as_me:10688: checking for libintl.h and gettext()" >&5
+      echo "$as_me:10737: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
-      echo "$as_me:10690: result: $cf_cv_func_gettext" >&5
+      echo "$as_me:10739: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       LIBS="$cf_save_LIBS_1"
@@ -10732,7 +10781,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10735 "configure"
+#line 10784 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10744,16 +10793,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10750: \$? = $ac_status" >&5
+  echo "$as_me:10799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10756: \$? = $ac_status" >&5
+  echo "$as_me:10805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10770,7 +10819,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}:10773: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10822: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10809,7 +10858,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}:10812: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10861: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -10825,13 +10874,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10828: checking for $ac_func" >&5
+echo "$as_me:10877: 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 10834 "configure"
+#line 10883 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10862,16 +10911,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10868: \$? = $ac_status" >&5
+  echo "$as_me:10917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10874: \$? = $ac_status" >&5
+  echo "$as_me:10923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10881,7 +10930,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10884: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10933: 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
@@ -10896,7 +10945,7 @@ done
           CATOBJEXT=.gmo
         fi
       elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
-        { echo "$as_me:10899: WARNING: disabling NLS feature" >&5
+        { echo "$as_me:10948: 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
@@ -10932,7 +10981,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:10935: WARNING: no NLS library is packaged with this application" >&5
+        { echo "$as_me:10984: 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
@@ -10941,7 +10990,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:10944: WARNING: found msgfmt program is not GNU msgfmt" >&5
+        { echo "$as_me:10993: WARNING: found msgfmt program is not GNU msgfmt" >&5
 echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       fi
     fi
@@ -10950,7 +10999,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:10953: WARNING: found xgettext program is not GNU xgettext" >&5
+        { echo "$as_me:11002: WARNING: found xgettext program is not GNU xgettext" >&5
 echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
       fi
     fi
@@ -10968,7 +11017,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:10971: checking for $ac_word" >&5
+echo "$as_me:11020: 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
@@ -10983,7 +11032,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:10986: found $ac_dir/$ac_word" >&5
+echo "$as_me:11035: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -10991,10 +11040,10 @@ fi
 fi
 INTL_YACC=$ac_cv_prog_INTL_YACC
 if test -n "$INTL_YACC"; then
-  echo "$as_me:10994: result: $INTL_YACC" >&5
+  echo "$as_me:11043: result: $INTL_YACC" >&5
 echo "${ECHO_T}$INTL_YACC" >&6
 else
-  echo "$as_me:10997: result: no" >&5
+  echo "$as_me:11046: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11004,7 +11053,7 @@ done
       if test -z "$INTL_YACC"; then
         ac_verc_fail=yes
       else
-                echo "$as_me:11007: checking version of $INTL_YACC" >&5
+                echo "$as_me:11056: 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
@@ -11015,7 +11064,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:11018: result: $ac_prog_version" >&5
+      echo "$as_me:11067: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
       fi
       if test "$ac_verc_fail" = yes; then
@@ -11042,7 +11091,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:11045: checking for catalogs to be installed" >&5
+       echo "$as_me:11094: 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
@@ -11062,7 +11111,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:11065: result: $LINGUAS" >&5
+       echo "$as_me:11114: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -11098,7 +11147,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d "$srcdir/po" ; then
-echo "$as_me:11101: checking if we should use included message-library" >&5
+echo "$as_me:11150: 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.
@@ -11109,7 +11158,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:11112: result: $use_our_messages" >&5
+echo "$as_me:11161: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -11151,23 +11200,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11154: checking for $ac_header" >&5
+echo "$as_me:11203: 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 11160 "configure"
+#line 11209 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11164: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11213: \"$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:11170: \$? = $ac_status" >&5
+  echo "$as_me:11219: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11186,7 +11235,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11189: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11238: 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
@@ -11275,7 +11324,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:11278: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:11327: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11284,7 +11333,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:11287: checking if you want full utility pathnames" >&5
+echo "$as_me:11336: 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.
@@ -11301,14 +11350,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:11304: result: $with_full_paths" >&5
+echo "$as_me:11353: 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:11311: checking for system mailer" >&5
+echo "$as_me:11360: 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
@@ -11328,14 +11377,14 @@ else
 
 fi
 
-echo "$as_me:11331: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:11380: 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:11338: checking system mail flags" >&5
+echo "$as_me:11387: 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
@@ -11351,7 +11400,7 @@ else
 
 fi
 
-echo "$as_me:11354: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:11403: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -11364,14 +11413,14 @@ if test "$with_full_paths" = no ; then
 fi
 fi
 
-echo "$as_me:11367: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:11416: 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 11374 "configure"
+#line 11423 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11390,16 +11439,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11396: \$? = $ac_status" >&5
+  echo "$as_me:11445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11402: \$? = $ac_status" >&5
+  echo "$as_me:11451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -11410,7 +11459,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11413: result: $cf_cv_posix_visible" >&5
+echo "$as_me:11462: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -11451,18 +11500,18 @@ case "$host_os" in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|linux*gnueabi|linux*gnueabihf|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:11458: checking if this is the GNU C library" >&5
+echo "$as_me:11507: 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 11465 "configure"
+#line 11514 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11481,16 +11530,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11487: \$? = $ac_status" >&5
+  echo "$as_me:11536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11493: \$? = $ac_status" >&5
+  echo "$as_me:11542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -11501,7 +11550,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11504: result: $cf_cv_gnu_library" >&5
+echo "$as_me:11553: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -11509,7 +11558,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:11512: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:11561: 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
@@ -11521,7 +11570,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11524 "configure"
+#line 11573 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11540,16 +11589,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11592: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11546: \$? = $ac_status" >&5
+  echo "$as_me:11595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11552: \$? = $ac_status" >&5
+  echo "$as_me:11601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -11561,12 +11610,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:11564: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:11613: 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:11569: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:11618: 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
@@ -11671,7 +11720,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11674 "configure"
+#line 11723 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -11691,16 +11740,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11697: \$? = $ac_status" >&5
+  echo "$as_me:11746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11703: \$? = $ac_status" >&5
+  echo "$as_me:11752: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11711,7 +11760,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11714: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11763: 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
@@ -11720,14 +11769,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11723: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11772: 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 11730 "configure"
+#line 11779 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11742,16 +11791,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11794: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11748: \$? = $ac_status" >&5
+  echo "$as_me:11797: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11754: \$? = $ac_status" >&5
+  echo "$as_me:11803: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11858,7 +11907,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11861 "configure"
+#line 11910 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11873,16 +11922,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11879: \$? = $ac_status" >&5
+  echo "$as_me:11928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11885: \$? = $ac_status" >&5
+  echo "$as_me:11934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11897,12 +11946,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11900: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11949: 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:11905: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11954: 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
@@ -11912,7 +11961,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11915 "configure"
+#line 11964 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11927,16 +11976,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11933: \$? = $ac_status" >&5
+  echo "$as_me:11982: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11939: \$? = $ac_status" >&5
+  echo "$as_me:11988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11947,7 +11996,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11950: result: $cf_cv_default_source" >&5
+echo "$as_me:11999: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11984,16 +12033,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:11987: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12036: 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}:11993: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12042: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11996 "configure"
+#line 12045 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12008,16 +12057,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12014: \$? = $ac_status" >&5
+  echo "$as_me:12063: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12020: \$? = $ac_status" >&5
+  echo "$as_me:12069: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12038,7 +12087,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12041 "configure"
+#line 12090 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12053,16 +12102,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12059: \$? = $ac_status" >&5
+  echo "$as_me:12108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12065: \$? = $ac_status" >&5
+  echo "$as_me:12114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12073,7 +12122,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12076: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12125: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12081,10 +12130,10 @@ echo "${as_me:-configure}:12076: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12084: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12133: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12087 "configure"
+#line 12136 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12099,16 +12148,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12151: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12105: \$? = $ac_status" >&5
+  echo "$as_me:12154: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12111: \$? = $ac_status" >&5
+  echo "$as_me:12160: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12124,7 +12173,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12127: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12176: 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
@@ -12241,7 +12290,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:12244: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:12293: 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
@@ -12273,14 +12322,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:12276: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12325: 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 12283 "configure"
+#line 12332 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12294,21 +12343,22 @@ main (void)
 #ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12352: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12305: \$? = $ac_status" >&5
+  echo "$as_me:12355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12311: \$? = $ac_status" >&5
+  echo "$as_me:12361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12320,7 +12370,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12323 "configure"
+#line 12373 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12331,24 +12381,25 @@ int
 main (void)
 {
 
-#ifdef _XOPEN_SOURCE
+#ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12393: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12345: \$? = $ac_status" >&5
+  echo "$as_me:12396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12351: \$? = $ac_status" >&5
+  echo "$as_me:12402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12357,13 +12408,13 @@ cat "conftest.$ac_ext" >&5
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	CPPFLAGS="$cf_save"
+		CPPFLAGS="$cf_save"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12366: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12417: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12506,6 +12557,8 @@ done
 
 fi
 
+	cf_save_xopen_cppflags="$CPPFLAGS"
+
 if test "$cf_cv_posix_visible" = no; then
 
 cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
@@ -12521,16 +12574,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:12524: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12577: 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}:12530: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12583: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12533 "configure"
+#line 12586 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12545,16 +12598,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12551: \$? = $ac_status" >&5
+  echo "$as_me:12604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12557: \$? = $ac_status" >&5
+  echo "$as_me:12610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12575,7 +12628,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12578 "configure"
+#line 12631 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12590,16 +12643,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12596: \$? = $ac_status" >&5
+  echo "$as_me:12649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12602: \$? = $ac_status" >&5
+  echo "$as_me:12655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12610,7 +12663,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12613: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12666: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12618,10 +12671,10 @@ echo "${as_me:-configure}:12613: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12621: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12674: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12624 "configure"
+#line 12677 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12636,16 +12689,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12692: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12642: \$? = $ac_status" >&5
+  echo "$as_me:12695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12648: \$? = $ac_status" >&5
+  echo "$as_me:12701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12661,7 +12714,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12664: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12717: 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
@@ -12770,6 +12823,53 @@ fi
 
 fi # cf_cv_posix_visible
 
+	# Some of these niche implementations use copy/paste, double-check...
+	test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE inteferes" 1>&6
+
+echo "${as_me:-configure}:12829: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+
+	cat >"conftest.$ac_ext" <<_ACEOF
+#line 12832 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+int
+main (void)
+{
+
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12852: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:12855: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12858: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12861: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+		{ echo "$as_me:12868: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+		CPPFLAGS="$cf_save_xopen_cppflags"
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	;;
 esac
 
@@ -12787,7 +12887,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}:12790: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12890: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12799,7 +12899,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}:12802: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12902: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12887,7 +12987,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}:12890: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12990: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12897,7 +12997,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}:12900: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13000: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12907,7 +13007,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}:12910: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13010: 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"
@@ -12919,10 +13019,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12922: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:13022: 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 12925 "configure"
+#line 13025 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12937,16 +13037,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12943: \$? = $ac_status" >&5
+  echo "$as_me:13043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12949: \$? = $ac_status" >&5
+  echo "$as_me:13049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12955,12 +13055,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:12958: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:13058: 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 12963 "configure"
+#line 13063 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12975,16 +13075,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12981: \$? = $ac_status" >&5
+  echo "$as_me:13081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12987: \$? = $ac_status" >&5
+  echo "$as_me:13087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12995,19 +13095,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:12998: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:13098: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:13003: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13103: 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 13010 "configure"
+#line 13110 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13021,21 +13121,22 @@ main (void)
 #ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13029: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13032: \$? = $ac_status" >&5
+  echo "$as_me:13133: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13038: \$? = $ac_status" >&5
+  echo "$as_me:13139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13047,7 +13148,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13050 "configure"
+#line 13151 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13058,24 +13159,25 @@ int
 main (void)
 {
 
-#ifdef _XOPEN_SOURCE
+#ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13072: \$? = $ac_status" >&5
+  echo "$as_me:13174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13078: \$? = $ac_status" >&5
+  echo "$as_me:13180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13084,13 +13186,13 @@ cat "conftest.$ac_ext" >&5
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	CPPFLAGS="$cf_save"
+		CPPFLAGS="$cf_save"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13093: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13195: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13237,14 +13339,14 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:13240: checking if SIGWINCH is defined" >&5
+echo "$as_me:13342: 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 13247 "configure"
+#line 13349 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13259,23 +13361,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13262: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13265: \$? = $ac_status" >&5
+  echo "$as_me:13367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13271: \$? = $ac_status" >&5
+  echo "$as_me:13373: \$? = $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 13278 "configure"
+#line 13380 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13293,16 +13395,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13299: \$? = $ac_status" >&5
+  echo "$as_me:13401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13305: \$? = $ac_status" >&5
+  echo "$as_me:13407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -13316,11 +13418,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13319: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:13421: 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:13323: checking for actual SIGWINCH definition" >&5
+echo "$as_me:13425: 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
@@ -13331,7 +13433,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13334 "configure"
+#line 13436 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13353,16 +13455,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13359: \$? = $ac_status" >&5
+  echo "$as_me:13461: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13365: \$? = $ac_status" >&5
+  echo "$as_me:13467: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -13376,7 +13478,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:13379: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:13481: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -13388,7 +13490,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13391: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13493: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -13473,7 +13575,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}:13476: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13578: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -13483,7 +13585,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}:13486: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13588: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -13493,7 +13595,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}:13496: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13598: 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"
@@ -13502,7 +13604,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13505 "configure"
+#line 13607 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13514,16 +13616,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13520: \$? = $ac_status" >&5
+  echo "$as_me:13622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13526: \$? = $ac_status" >&5
+  echo "$as_me:13628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13531,12 +13633,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13534: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13636: 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}:13539: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:13641: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -13548,7 +13650,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:13551: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:13653: 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
@@ -13563,10 +13665,10 @@ else
 fi;
 
 fi
-echo "$as_me:13566: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:13668: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:13569: checking if you want ssl library" >&5
+echo "$as_me:13671: 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
@@ -13581,10 +13683,10 @@ else
 fi;
 
 fi
-echo "$as_me:13584: result: $cf_cv_use_libssl" >&5
+echo "$as_me:13686: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:13587: checking if you want gnutls support" >&5
+echo "$as_me:13689: 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
@@ -13599,11 +13701,11 @@ else
 fi;
 
 fi
-echo "$as_me:13602: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:13704: 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:13606: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:13708: 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
@@ -13618,10 +13720,10 @@ else
 fi;
 
 fi
-echo "$as_me:13621: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:13723: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:13624: checking if you want socks library" >&5
+echo "$as_me:13726: 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
@@ -13636,10 +13738,10 @@ else
 fi;
 
 fi
-echo "$as_me:13639: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:13741: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:13642: checking if you want socks5 library" >&5
+echo "$as_me:13744: 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
@@ -13654,7 +13756,7 @@ else
 fi;
 
 fi
-echo "$as_me:13657: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:13759: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -13696,7 +13798,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13699 "configure"
+#line 13801 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13708,16 +13810,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13714: \$? = $ac_status" >&5
+  echo "$as_me:13816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13720: \$? = $ac_status" >&5
+  echo "$as_me:13822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13734,7 +13836,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}:13737: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13839: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13780,7 +13882,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13783 "configure"
+#line 13885 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13792,16 +13894,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13798: \$? = $ac_status" >&5
+  echo "$as_me:13900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13804: \$? = $ac_status" >&5
+  echo "$as_me:13906: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13818,7 +13920,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}:13821: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13923: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13836,7 +13938,7 @@ echo "${as_me:-configure}:13821: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13839: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:13941: 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
@@ -13861,7 +13963,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}:13864: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13966: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13890,7 +13992,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}:13893: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13995: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13899,7 +14001,7 @@ echo "${as_me:-configure}:13893: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13902: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:14004: 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
@@ -13913,12 +14015,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:13916: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14018: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13921 "configure"
+#line 14023 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13934,16 +14036,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13940: \$? = $ac_status" >&5
+  echo "$as_me:14042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13946: \$? = $ac_status" >&5
+  echo "$as_me:14048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -13957,7 +14059,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13960 "configure"
+#line 14062 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13973,16 +14075,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13979: \$? = $ac_status" >&5
+  echo "$as_me:14081: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13985: \$? = $ac_status" >&5
+  echo "$as_me:14087: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -13999,9 +14101,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:14002: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:14104: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:14004: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14106: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14092,7 +14194,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}:14095: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14197: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -14100,7 +14202,7 @@ echo "${as_me:-configure}:14095: testing ... testing $cf_cv_header_path_socks ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 14103 "configure"
+#line 14205 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14116,21 +14218,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14122: \$? = $ac_status" >&5
+  echo "$as_me:14224: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14128: \$? = $ac_status" >&5
+  echo "$as_me:14230: \$? = $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}:14133: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14235: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14148,7 +14250,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:14151: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14253: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14223,13 +14325,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}:14226: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14328: 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 14232 "configure"
+#line 14334 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14245,21 +14347,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14251: \$? = $ac_status" >&5
+  echo "$as_me:14353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14257: \$? = $ac_status" >&5
+  echo "$as_me:14359: \$? = $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}:14262: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14364: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -14321,7 +14423,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14324 "configure"
+#line 14426 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14333,16 +14435,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14438: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14339: \$? = $ac_status" >&5
+  echo "$as_me:14441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14345: \$? = $ac_status" >&5
+  echo "$as_me:14447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14359,7 +14461,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}:14362: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14464: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14395,7 +14497,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}:14398: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14500: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14420,7 +14522,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:14423: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:14525: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -14463,7 +14565,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:14466: error: cannot link with socks library" >&5
+    { { echo "$as_me:14568: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -14507,7 +14609,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14510 "configure"
+#line 14612 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14519,16 +14621,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14525: \$? = $ac_status" >&5
+  echo "$as_me:14627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14531: \$? = $ac_status" >&5
+  echo "$as_me:14633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14545,7 +14647,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}:14548: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14650: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14591,7 +14693,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14594 "configure"
+#line 14696 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14603,16 +14705,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14609: \$? = $ac_status" >&5
+  echo "$as_me:14711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14615: \$? = $ac_status" >&5
+  echo "$as_me:14717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14629,7 +14731,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}:14632: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14734: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14647,7 +14749,7 @@ echo "${as_me:-configure}:14632: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14650: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14752: 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
@@ -14672,7 +14774,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}:14675: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14777: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14701,7 +14803,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}:14704: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14806: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14710,7 +14812,7 @@ echo "${as_me:-configure}:14704: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14713: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14815: 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
@@ -14743,11 +14845,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:14746: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:14848: 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 14750 "configure"
+#line 14852 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -14761,16 +14863,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14767: \$? = $ac_status" >&5
+  echo "$as_me:14869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14773: \$? = $ac_status" >&5
+  echo "$as_me:14875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -14782,7 +14884,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14785 "configure"
+#line 14887 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -14794,29 +14896,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14800: \$? = $ac_status" >&5
+  echo "$as_me:14902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14806: \$? = $ac_status" >&5
+  echo "$as_me:14908: \$? = $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:14812: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:14914: 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:14819: result: $cf_use_socks4" >&5
+echo "$as_me:14921: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -14871,10 +14973,10 @@ EOF
 
 fi
 
-echo "$as_me:14874: checking if socks5p.h is available" >&5
+echo "$as_me:14976: 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 14877 "configure"
+#line 14979 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -14889,16 +14991,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14892: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14895: \$? = $ac_status" >&5
+  echo "$as_me:14997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14901: \$? = $ac_status" >&5
+  echo "$as_me:15003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -14907,7 +15009,7 @@ cat "conftest.$ac_ext" >&5
 cf_use_socks5p_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:14910: result: $cf_use_socks5p_h" >&5
+echo "$as_me:15012: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -14919,14 +15021,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:14922: checking for network libraries" >&5
+echo "$as_me:15024: 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:14929: result: working..." >&5
+echo "$as_me:15031: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -14938,23 +15040,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:14941: checking for $ac_header" >&5
+echo "$as_me:15043: 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 14947 "configure"
+#line 15049 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14951: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15053: \"$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:14957: \$? = $ac_status" >&5
+  echo "$as_me:15059: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14973,7 +15075,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:14976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15078: 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
@@ -15008,7 +15110,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15011 "configure"
+#line 15113 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -15035,22 +15137,22 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15041: \$? = $ac_status" >&5
+  echo "$as_me:15143: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15047: \$? = $ac_status" >&5
+  echo "$as_me:15149: \$? = $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:15053: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:15155: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15063,13 +15165,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:15066: checking for $ac_func" >&5
+echo "$as_me:15168: 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 15072 "configure"
+#line 15174 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15100,16 +15202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15106: \$? = $ac_status" >&5
+  echo "$as_me:15208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15112: \$? = $ac_status" >&5
+  echo "$as_me:15214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15119,7 +15221,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15122: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15224: 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
@@ -15128,7 +15230,7 @@ EOF
 
 else
 
-echo "$as_me:15131: checking for gethostname in -lnsl" >&5
+echo "$as_me:15233: 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
@@ -15136,7 +15238,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15139 "configure"
+#line 15241 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15155,16 +15257,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15161: \$? = $ac_status" >&5
+  echo "$as_me:15263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15167: \$? = $ac_status" >&5
+  echo "$as_me:15269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -15175,7 +15277,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15178: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:15280: 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
 
@@ -15192,7 +15294,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:15195: checking for gethostname in -lsocket" >&5
+echo "$as_me:15297: 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
@@ -15200,7 +15302,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15203 "configure"
+#line 15305 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15219,16 +15321,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15225: \$? = $ac_status" >&5
+  echo "$as_me:15327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15231: \$? = $ac_status" >&5
+  echo "$as_me:15333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -15239,7 +15341,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15242: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:15344: 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
 
@@ -15263,7 +15365,7 @@ fi
 fi
 done
 
-	echo "$as_me:15266: checking for main in -linet" >&5
+	echo "$as_me:15368: 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
@@ -15271,7 +15373,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15274 "configure"
+#line 15376 "configure"
 #include "confdefs.h"
 
 int
@@ -15283,16 +15385,16 @@ main ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15289: \$? = $ac_status" >&5
+  echo "$as_me:15391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15295: \$? = $ac_status" >&5
+  echo "$as_me:15397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -15303,7 +15405,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15306: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:15408: 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"
@@ -15314,13 +15416,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15317: checking for $ac_func" >&5
+echo "$as_me:15419: 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 15323 "configure"
+#line 15425 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15351,16 +15453,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15357: \$? = $ac_status" >&5
+  echo "$as_me:15459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15363: \$? = $ac_status" >&5
+  echo "$as_me:15465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15370,7 +15472,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15373: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15475: 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
@@ -15379,7 +15481,7 @@ EOF
 
 else
 
-echo "$as_me:15382: checking for socket in -lsocket" >&5
+echo "$as_me:15484: 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
@@ -15387,7 +15489,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15390 "configure"
+#line 15492 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15406,16 +15508,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15412: \$? = $ac_status" >&5
+  echo "$as_me:15514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15418: \$? = $ac_status" >&5
+  echo "$as_me:15520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -15426,7 +15528,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15429: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:15531: 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
 
@@ -15443,7 +15545,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:15446: checking for socket in -lbsd" >&5
+echo "$as_me:15548: 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
@@ -15451,7 +15553,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15454 "configure"
+#line 15556 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15470,16 +15572,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15476: \$? = $ac_status" >&5
+  echo "$as_me:15578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15482: \$? = $ac_status" >&5
+  echo "$as_me:15584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -15490,7 +15592,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15493: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:15595: 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
 
@@ -15519,13 +15621,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15522: checking for $ac_func" >&5
+echo "$as_me:15624: 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 15528 "configure"
+#line 15630 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15556,16 +15658,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15562: \$? = $ac_status" >&5
+  echo "$as_me:15664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15568: \$? = $ac_status" >&5
+  echo "$as_me:15670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15575,7 +15677,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15578: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15680: 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
@@ -15584,7 +15686,7 @@ EOF
 
 else
 
-echo "$as_me:15587: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:15689: 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
@@ -15592,7 +15694,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15595 "configure"
+#line 15697 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15611,16 +15713,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15614: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15617: \$? = $ac_status" >&5
+  echo "$as_me:15719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15623: \$? = $ac_status" >&5
+  echo "$as_me:15725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -15631,7 +15733,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15634: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:15736: 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
 
@@ -15656,13 +15758,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15659: checking for $ac_func" >&5
+echo "$as_me:15761: 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 15665 "configure"
+#line 15767 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15693,16 +15795,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15699: \$? = $ac_status" >&5
+  echo "$as_me:15801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15705: \$? = $ac_status" >&5
+  echo "$as_me:15807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15712,7 +15814,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15715: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15817: 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
@@ -15721,7 +15823,7 @@ EOF
 
 else
 
-echo "$as_me:15724: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:15826: 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
@@ -15729,7 +15831,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15732 "configure"
+#line 15834 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15748,16 +15850,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15754: \$? = $ac_status" >&5
+  echo "$as_me:15856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15760: \$? = $ac_status" >&5
+  echo "$as_me:15862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -15768,7 +15870,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15771: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:15873: 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
 
@@ -15793,13 +15895,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15796: checking for $ac_func" >&5
+echo "$as_me:15898: 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 15802 "configure"
+#line 15904 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15830,16 +15932,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15836: \$? = $ac_status" >&5
+  echo "$as_me:15938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15842: \$? = $ac_status" >&5
+  echo "$as_me:15944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15849,7 +15951,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15852: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15954: 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
@@ -15858,7 +15960,7 @@ EOF
 
 else
 
-echo "$as_me:15861: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:15963: 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
@@ -15866,7 +15968,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15869 "configure"
+#line 15971 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15885,16 +15987,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15888: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15891: \$? = $ac_status" >&5
+  echo "$as_me:15993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15897: \$? = $ac_status" >&5
+  echo "$as_me:15999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -15905,7 +16007,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15908: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:16010: 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
 
@@ -15930,13 +16032,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15933: checking for $ac_func" >&5
+echo "$as_me:16035: 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 15939 "configure"
+#line 16041 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15967,16 +16069,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15973: \$? = $ac_status" >&5
+  echo "$as_me:16075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15979: \$? = $ac_status" >&5
+  echo "$as_me:16081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15986,7 +16088,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15989: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16091: 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
@@ -15995,7 +16097,7 @@ EOF
 
 else
 
-echo "$as_me:15998: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:16100: 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
@@ -16003,7 +16105,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16006 "configure"
+#line 16108 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16022,16 +16124,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16028: \$? = $ac_status" >&5
+  echo "$as_me:16130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16034: \$? = $ac_status" >&5
+  echo "$as_me:16136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -16042,7 +16144,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16045: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:16147: 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
 
@@ -16099,14 +16201,14 @@ test "$cf_test_netlibs" = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:16102: checking for inet_aton function" >&5
+echo "$as_me:16204: 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 16109 "configure"
+#line 16211 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -16141,16 +16243,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16147: \$? = $ac_status" >&5
+  echo "$as_me:16249: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16153: \$? = $ac_status" >&5
+  echo "$as_me:16255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -16160,7 +16262,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16163: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:16265: 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
 
@@ -16169,14 +16271,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:16172: checking for inet_addr function" >&5
+    echo "$as_me:16274: 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 16179 "configure"
+#line 16281 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -16211,16 +16313,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16217: \$? = $ac_status" >&5
+  echo "$as_me:16319: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16223: \$? = $ac_status" >&5
+  echo "$as_me:16325: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -16230,10 +16332,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16233: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:16335: 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:16236: checking for library with inet_addr" >&5
+	echo "$as_me:16338: 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
@@ -16244,7 +16346,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16247 "configure"
+#line 16349 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -16260,16 +16362,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16266: \$? = $ac_status" >&5
+  echo "$as_me:16368: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16272: \$? = $ac_status" >&5
+  echo "$as_me:16374: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -16283,7 +16385,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    done
 
 fi
-echo "$as_me:16286: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:16388: 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
 
@@ -16304,13 +16406,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:16307: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:16409: 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:16313: checking if you want to use pkg-config" >&5
+echo "$as_me:16415: 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.
@@ -16320,7 +16422,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:16323: result: $cf_pkg_config" >&5
+echo "$as_me:16425: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -16332,7 +16434,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:16335: checking for $ac_word" >&5
+echo "$as_me:16437: 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
@@ -16349,7 +16451,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:16352: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16454: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16360,10 +16462,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:16363: result: $PKG_CONFIG" >&5
+  echo "$as_me:16465: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:16366: result: no" >&5
+  echo "$as_me:16468: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16372,7 +16474,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:16375: checking for $ac_word" >&5
+echo "$as_me:16477: 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
@@ -16389,7 +16491,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:16392: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16494: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16401,10 +16503,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:16404: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:16506: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:16407: result: no" >&5
+  echo "$as_me:16509: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16447,14 +16549,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:16450: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:16552: 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:16457: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:16559: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -16502,7 +16604,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16505 "configure"
+#line 16607 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16514,16 +16616,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16520: \$? = $ac_status" >&5
+  echo "$as_me:16622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16526: \$? = $ac_status" >&5
+  echo "$as_me:16628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16540,7 +16642,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}:16543: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16645: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16586,7 +16688,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16589 "configure"
+#line 16691 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16598,16 +16700,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16604: \$? = $ac_status" >&5
+  echo "$as_me:16706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16610: \$? = $ac_status" >&5
+  echo "$as_me:16712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16624,7 +16726,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}:16627: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16729: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16642,7 +16744,7 @@ echo "${as_me:-configure}:16627: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16645: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16747: 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
@@ -16667,7 +16769,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}:16670: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16772: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16696,7 +16798,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}:16699: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16801: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16705,7 +16807,7 @@ echo "${as_me:-configure}:16699: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16708: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16810: 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
@@ -16722,15 +16824,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:16725: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:16827: 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:16729: result: yes" >&5
+					echo "$as_me:16831: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:16733: result: no" >&5
+					echo "$as_me:16835: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -16874,7 +16976,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16877: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16979: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -16910,7 +17012,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:16913: checking for dlsym in -ldl" >&5
+				echo "$as_me:17015: 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
@@ -16918,7 +17020,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16921 "configure"
+#line 17023 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16937,16 +17039,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16943: \$? = $ac_status" >&5
+  echo "$as_me:17045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16949: \$? = $ac_status" >&5
+  echo "$as_me:17051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -16957,7 +17059,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16960: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:17062: 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"
@@ -16973,12 +17075,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:16976: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17078: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16981 "configure"
+#line 17083 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17007,16 +17109,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17013: \$? = $ac_status" >&5
+  echo "$as_me:17115: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17019: \$? = $ac_status" >&5
+  echo "$as_me:17121: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17030,7 +17132,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17033 "configure"
+#line 17135 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17059,16 +17161,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17065: \$? = $ac_status" >&5
+  echo "$as_me:17167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17071: \$? = $ac_status" >&5
+  echo "$as_me:17173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17085,9 +17187,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:17088: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:17190: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:17090: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17192: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17178,7 +17280,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}:17181: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17283: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -17186,7 +17288,7 @@ echo "${as_me:-configure}:17181: testing ... testing $cf_cv_header_path_ssl ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_ssl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 17189 "configure"
+#line 17291 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17215,21 +17317,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17221: \$? = $ac_status" >&5
+  echo "$as_me:17323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17227: \$? = $ac_status" >&5
+  echo "$as_me:17329: \$? = $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}:17232: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17334: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17247,7 +17349,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:17250: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17352: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -17255,7 +17357,7 @@ echo "${as_me:-configure}:17250: 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 17258 "configure"
+#line 17360 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17284,21 +17386,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17290: \$? = $ac_status" >&5
+  echo "$as_me:17392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17296: \$? = $ac_status" >&5
+  echo "$as_me:17398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:17301: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:17403: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -17379,13 +17481,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}:17382: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17484: 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 17388 "configure"
+#line 17490 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17414,21 +17516,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17420: \$? = $ac_status" >&5
+  echo "$as_me:17522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17426: \$? = $ac_status" >&5
+  echo "$as_me:17528: \$? = $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}:17431: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17533: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -17490,7 +17592,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}:17493: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17595: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17549,7 +17651,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17552 "configure"
+#line 17654 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17561,16 +17663,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17666: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17567: \$? = $ac_status" >&5
+  echo "$as_me:17669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17573: \$? = $ac_status" >&5
+  echo "$as_me:17675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17587,7 +17689,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}:17590: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17692: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17620,7 +17722,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}:17623: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17725: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case "$cf_cv_header_path_ssl" in
 			(*/openssl)
@@ -17633,10 +17735,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:17636: checking for X509 support" >&5
+echo "$as_me:17738: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17639 "configure"
+#line 17741 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17665,16 +17767,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:17668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17671: \$? = $ac_status" >&5
+  echo "$as_me:17773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17677: \$? = $ac_status" >&5
+  echo "$as_me:17779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -17683,7 +17785,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:17686: result: $cf_x509_support" >&5
+echo "$as_me:17788: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17738,7 +17840,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17741 "configure"
+#line 17843 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17750,16 +17852,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17756: \$? = $ac_status" >&5
+  echo "$as_me:17858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17762: \$? = $ac_status" >&5
+  echo "$as_me:17864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17776,7 +17878,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}:17779: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17881: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17822,7 +17924,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17825 "configure"
+#line 17927 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17834,16 +17936,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17939: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17840: \$? = $ac_status" >&5
+  echo "$as_me:17942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17846: \$? = $ac_status" >&5
+  echo "$as_me:17948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17860,7 +17962,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}:17863: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17965: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17878,7 +17980,7 @@ echo "${as_me:-configure}:17863: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:17881: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17983: 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
@@ -17903,7 +18005,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}:17906: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18008: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17932,7 +18034,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}:17935: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18037: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17941,7 +18043,7 @@ echo "${as_me:-configure}:17935: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:17944: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:18046: 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
@@ -17959,12 +18061,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}:17962: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:18064: 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}:17967: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18069: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -18096,7 +18198,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:18099: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:18201: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -18118,7 +18220,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}:18121: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18223: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -18138,12 +18240,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:18141: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18243: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18146 "configure"
+#line 18248 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18172,16 +18274,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18178: \$? = $ac_status" >&5
+  echo "$as_me:18280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18184: \$? = $ac_status" >&5
+  echo "$as_me:18286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18195,7 +18297,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18198 "configure"
+#line 18300 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18224,16 +18326,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18230: \$? = $ac_status" >&5
+  echo "$as_me:18332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18236: \$? = $ac_status" >&5
+  echo "$as_me:18338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18250,9 +18352,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:18253: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:18355: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:18255: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18357: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18343,7 +18445,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}:18346: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18448: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -18351,7 +18453,7 @@ echo "${as_me:-configure}:18346: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 18354 "configure"
+#line 18456 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18380,21 +18482,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18386: \$? = $ac_status" >&5
+  echo "$as_me:18488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18392: \$? = $ac_status" >&5
+  echo "$as_me:18494: \$? = $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}:18397: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18499: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18412,7 +18514,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:18415: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18517: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -18487,13 +18589,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}:18490: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18592: 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 18496 "configure"
+#line 18598 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18522,21 +18624,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18528: \$? = $ac_status" >&5
+  echo "$as_me:18630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18534: \$? = $ac_status" >&5
+  echo "$as_me:18636: \$? = $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}:18539: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18641: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -18616,7 +18718,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18619 "configure"
+#line 18721 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18628,16 +18730,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18631: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18634: \$? = $ac_status" >&5
+  echo "$as_me:18736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18640: \$? = $ac_status" >&5
+  echo "$as_me:18742: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -18654,7 +18756,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}:18657: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18759: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18695,7 +18797,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}:18698: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18800: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18724,13 +18826,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:18727: checking for $ac_func" >&5
+echo "$as_me:18829: 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 18733 "configure"
+#line 18835 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18761,16 +18863,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18767: \$? = $ac_status" >&5
+  echo "$as_me:18869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18773: \$? = $ac_status" >&5
+  echo "$as_me:18875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18780,7 +18882,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18783: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18885: 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
@@ -18790,13 +18892,13 @@ EOF
 fi
 done
 
-		echo "$as_me:18793: checking for gnutls_rnd" >&5
+		echo "$as_me:18895: 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 18799 "configure"
+#line 18901 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18827,16 +18929,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18833: \$? = $ac_status" >&5
+  echo "$as_me:18935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18839: \$? = $ac_status" >&5
+  echo "$as_me:18941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -18846,7 +18948,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18849: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:18951: 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
 
@@ -18876,10 +18978,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:18879: checking for X509 support" >&5
+echo "$as_me:18981: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18882 "configure"
+#line 18984 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18908,16 +19010,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:18911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18914: \$? = $ac_status" >&5
+  echo "$as_me:19016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18920: \$? = $ac_status" >&5
+  echo "$as_me:19022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -18926,7 +19028,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:18929: result: $cf_x509_support" >&5
+echo "$as_me:19031: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -18980,7 +19082,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18983 "configure"
+#line 19085 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18992,16 +19094,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18998: \$? = $ac_status" >&5
+  echo "$as_me:19100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19004: \$? = $ac_status" >&5
+  echo "$as_me:19106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19018,7 +19120,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}:19021: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19123: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19064,7 +19166,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19067 "configure"
+#line 19169 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19076,16 +19178,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19181: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19082: \$? = $ac_status" >&5
+  echo "$as_me:19184: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19088: \$? = $ac_status" >&5
+  echo "$as_me:19190: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19102,7 +19204,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}:19105: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19207: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19120,7 +19222,7 @@ echo "${as_me:-configure}:19105: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:19123: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19225: 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
@@ -19145,7 +19247,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}:19148: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19250: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19174,7 +19276,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}:19177: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19279: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19183,7 +19285,7 @@ echo "${as_me:-configure}:19177: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:19186: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19288: 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
@@ -19201,12 +19303,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}:19204: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:19306: 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}:19209: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19311: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -19338,7 +19440,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:19341: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:19443: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -19360,7 +19462,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}:19363: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19465: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -19380,12 +19482,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:19383: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19485: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19388 "configure"
+#line 19490 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19414,16 +19516,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19420: \$? = $ac_status" >&5
+  echo "$as_me:19522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19426: \$? = $ac_status" >&5
+  echo "$as_me:19528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19437,7 +19539,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19440 "configure"
+#line 19542 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19466,16 +19568,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19472: \$? = $ac_status" >&5
+  echo "$as_me:19574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19478: \$? = $ac_status" >&5
+  echo "$as_me:19580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19492,9 +19594,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:19495: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:19597: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:19497: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19599: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19585,7 +19687,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}:19588: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19690: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -19593,7 +19695,7 @@ echo "${as_me:-configure}:19588: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19596 "configure"
+#line 19698 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19622,21 +19724,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19628: \$? = $ac_status" >&5
+  echo "$as_me:19730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19634: \$? = $ac_status" >&5
+  echo "$as_me:19736: \$? = $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}:19639: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19741: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19654,7 +19756,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:19657: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19759: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -19729,13 +19831,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}:19732: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19834: 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 19738 "configure"
+#line 19840 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19764,21 +19866,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19770: \$? = $ac_status" >&5
+  echo "$as_me:19872: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19776: \$? = $ac_status" >&5
+  echo "$as_me:19878: \$? = $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}:19781: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19883: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -19858,7 +19960,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19861 "configure"
+#line 19963 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19870,16 +19972,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19873: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19876: \$? = $ac_status" >&5
+  echo "$as_me:19978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19882: \$? = $ac_status" >&5
+  echo "$as_me:19984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19896,7 +19998,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}:19899: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20001: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19937,7 +20039,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}:19940: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20042: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19966,13 +20068,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:19969: checking for $ac_func" >&5
+echo "$as_me:20071: 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 19975 "configure"
+#line 20077 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20003,16 +20105,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20009: \$? = $ac_status" >&5
+  echo "$as_me:20111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20015: \$? = $ac_status" >&5
+  echo "$as_me:20117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20022,7 +20124,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20025: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20127: 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
@@ -20032,13 +20134,13 @@ EOF
 fi
 done
 
-		echo "$as_me:20035: checking for gnutls_rnd" >&5
+		echo "$as_me:20137: 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 20041 "configure"
+#line 20143 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20069,16 +20171,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20075: \$? = $ac_status" >&5
+  echo "$as_me:20177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20081: \$? = $ac_status" >&5
+  echo "$as_me:20183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -20088,7 +20190,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20091: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:20193: 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
 
@@ -20117,7 +20219,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:20120: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:20222: 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
@@ -20125,7 +20227,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20128 "configure"
+#line 20230 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20144,16 +20246,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20150: \$? = $ac_status" >&5
+  echo "$as_me:20252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20156: \$? = $ac_status" >&5
+  echo "$as_me:20258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -20164,7 +20266,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20167: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:20269: 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
 
@@ -20185,7 +20287,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:20188: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:20290: 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
@@ -20193,7 +20295,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20196 "configure"
+#line 20298 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20212,16 +20314,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20218: \$? = $ac_status" >&5
+  echo "$as_me:20320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20224: \$? = $ac_status" >&5
+  echo "$as_me:20326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -20232,7 +20334,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20235: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:20337: 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
 
@@ -20253,7 +20355,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:20256: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:20358: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20262,10 +20364,10 @@ fi
 
 			fi
 
-echo "$as_me:20265: checking for X509 support" >&5
+echo "$as_me:20367: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20268 "configure"
+#line 20370 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20294,16 +20396,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:20297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20300: \$? = $ac_status" >&5
+  echo "$as_me:20402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20306: \$? = $ac_status" >&5
+  echo "$as_me:20408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -20312,7 +20414,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:20315: result: $cf_x509_support" >&5
+echo "$as_me:20417: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -20344,7 +20446,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:20347: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:20449: 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
@@ -20352,7 +20454,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20355 "configure"
+#line 20457 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20371,16 +20473,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20377: \$? = $ac_status" >&5
+  echo "$as_me:20479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20383: \$? = $ac_status" >&5
+  echo "$as_me:20485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -20391,7 +20493,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20394: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:20496: 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
@@ -20406,11 +20508,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}:20409: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:20511: 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:20413: error: cannot find NSS compliant libraries" >&5
+			{ { echo "$as_me:20515: error: cannot find NSS compliant libraries" >&5
 echo "$as_me: error: cannot find NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -20425,13 +20527,13 @@ fi
 		elif test -d "$cf_cv_use_libnss_compat/../include" ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:20428: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:20530: 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:20434: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:20536: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -20560,10 +20662,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:20563: checking for NSS compliant include directory" >&5
+echo "$as_me:20665: 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 20566 "configure"
+#line 20668 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20577,16 +20679,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20583: \$? = $ac_status" >&5
+  echo "$as_me:20685: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20589: \$? = $ac_status" >&5
+  echo "$as_me:20691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_incl=yes
 else
@@ -20595,7 +20697,7 @@ cat "conftest.$ac_ext" >&5
 cf_ssl_incl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20598: result: $cf_ssl_incl" >&5
+echo "$as_me:20700: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -20604,10 +20706,10 @@ EOF
 
 fi
 
-echo "$as_me:20607: checking if we can link to NSS compliant library" >&5
+echo "$as_me:20709: 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 20610 "configure"
+#line 20712 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20626,16 +20728,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20632: \$? = $ac_status" >&5
+  echo "$as_me:20734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20638: \$? = $ac_status" >&5
+  echo "$as_me:20740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_library=yes
 else
@@ -20644,7 +20746,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:20647: result: $cf_ssl_library" >&5
+echo "$as_me:20749: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -20657,7 +20759,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:20660: error: Cannot link with NSS compliant libraries" >&5
+	{ { echo "$as_me:20762: error: Cannot link with NSS compliant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20665,7 +20767,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:20668: checking whether to enable ipv6" >&5
+echo "$as_me:20770: 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.
@@ -20682,11 +20784,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:20685: result: $enableval" >&5
+echo "$as_me:20787: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:20689: checking ipv6 stack type" >&5
+echo "$as_me:20791: 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
@@ -20707,7 +20809,7 @@ do
 		;;
 	(inria)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20710 "configure"
+#line 20812 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20724,7 +20826,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20727 "configure"
+#line 20829 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20741,7 +20843,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20744 "configure"
+#line 20846 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -20767,7 +20869,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20770 "configure"
+#line 20872 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20784,7 +20886,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20787 "configure"
+#line 20889 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -20801,7 +20903,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20804 "configure"
+#line 20906 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20823,13 +20925,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:20826: result: $cf_cv_ipv6type" >&5
+echo "$as_me:20928: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:20832: checking for IPv6 library if required" >&5
+echo "$as_me:20934: 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)
@@ -20859,13 +20961,13 @@ case "$cf_cv_ipv6type" in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:20862: result: $cf_ipv6lib" >&5
+echo "$as_me:20964: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20868 "configure"
+#line 20970 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20881,16 +20983,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20887: \$? = $ac_status" >&5
+  echo "$as_me:20989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20893: \$? = $ac_status" >&5
+  echo "$as_me:20995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21011,7 +21113,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21014 "configure"
+#line 21116 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21023,16 +21125,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21029: \$? = $ac_status" >&5
+  echo "$as_me:21131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21035: \$? = $ac_status" >&5
+  echo "$as_me:21137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21049,7 +21151,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}:21052: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21154: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21077,13 +21179,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:21080: checking for getaddrinfo" >&5
+	echo "$as_me:21182: 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 21086 "configure"
+#line 21188 "configure"
 #include "confdefs.h"
 #define getaddrinfo autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21114,16 +21216,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21120: \$? = $ac_status" >&5
+  echo "$as_me:21222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21126: \$? = $ac_status" >&5
+  echo "$as_me:21228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -21133,18 +21235,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21136: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:21238: 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:21143: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:21245: 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 21147 "configure"
+#line 21249 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21160,25 +21262,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21166: \$? = $ac_status" >&5
+  echo "$as_me:21268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21172: \$? = $ac_status" >&5
+  echo "$as_me:21274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21174: result: yes" >&5
+  echo "$as_me:21276: 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:21181: result: no" >&5
+echo "$as_me:21283: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21246,11 +21348,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21249: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:21351: 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 21253 "configure"
+#line 21355 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21266,25 +21368,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21272: \$? = $ac_status" >&5
+  echo "$as_me:21374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21278: \$? = $ac_status" >&5
+  echo "$as_me:21380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21280: result: yes" >&5
+  echo "$as_me:21382: 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:21287: result: no" >&5
+echo "$as_me:21389: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21299,7 +21401,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_ipv6lib"\"
 
 	if test "$cf_found_library" = no ; then
-		{ { echo "$as_me:21302: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:21404: 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;}
@@ -21307,7 +21409,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:21310: checking working getaddrinfo" >&5
+echo "$as_me:21412: 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
@@ -21317,7 +21419,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21320 "configure"
+#line 21422 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21397,15 +21499,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21403: \$? = $ac_status" >&5
+  echo "$as_me:21505: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21408: \$? = $ac_status" >&5
+  echo "$as_me:21510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -21418,7 +21520,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21421: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:21523: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -21434,12 +21536,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:21437: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:21539: 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:21442: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:21544: 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.
@@ -21450,7 +21552,7 @@ fi
 
 fi
 
-echo "$as_me:21453: checking for screen type" >&5
+echo "$as_me:21555: 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
@@ -21464,7 +21566,7 @@ case "$withval" in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:21467: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:21569: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21473,13 +21575,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:21476: result: $cf_cv_screen" >&5
+echo "$as_me:21578: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case "$cf_cv_screen" in
 (curses|ncurses*)
 
-echo "$as_me:21482: checking for specific curses-directory" >&5
+echo "$as_me:21584: 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.
@@ -21489,7 +21591,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:21492: result: $cf_cv_curses_dir" >&5
+echo "$as_me:21594: 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"
@@ -21520,7 +21622,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:21523: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:21625: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21556,7 +21658,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21559 "configure"
+#line 21661 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21568,16 +21670,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21574: \$? = $ac_status" >&5
+  echo "$as_me:21676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21580: \$? = $ac_status" >&5
+  echo "$as_me:21682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21594,7 +21696,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}:21597: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21699: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21630,7 +21732,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}:21633: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21735: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21649,7 +21751,7 @@ dft_color_style=yes
 case "$cf_cv_screen" in
 (curses)
 
-echo "$as_me:21652: checking for extra include directories" >&5
+echo "$as_me:21754: 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
@@ -21675,7 +21777,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:21678: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:21780: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -21685,7 +21787,7 @@ then
 
 fi
 
-echo "$as_me:21688: checking if we have identified curses headers" >&5
+echo "$as_me:21790: 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
@@ -21697,7 +21799,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21700 "configure"
+#line 21802 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21709,16 +21811,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21715: \$? = $ac_status" >&5
+  echo "$as_me:21817: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21721: \$? = $ac_status" >&5
+  echo "$as_me:21823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21729,11 +21831,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21732: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21834: 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:21736: error: No curses header-files found" >&5
+	{ { echo "$as_me:21838: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21743,23 +21845,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:21746: checking for $ac_header" >&5
+echo "$as_me:21848: 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 21752 "configure"
+#line 21854 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21756: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21858: \"$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:21762: \$? = $ac_status" >&5
+  echo "$as_me:21864: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21778,7 +21880,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:21781: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21883: 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
@@ -21788,7 +21890,7 @@ EOF
 fi
 done
 
-echo "$as_me:21791: checking for terminfo header" >&5
+echo "$as_me:21893: 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
@@ -21806,7 +21908,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21809 "configure"
+#line 21911 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21821,16 +21923,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21827: \$? = $ac_status" >&5
+  echo "$as_me:21929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21833: \$? = $ac_status" >&5
+  echo "$as_me:21935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21846,7 +21948,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21849: result: $cf_cv_term_header" >&5
+echo "$as_me:21951: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21878,7 +21980,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21881: checking for ncurses version" >&5
+echo "$as_me:21983: 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
@@ -21904,10 +22006,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21907: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22009: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21910: \$? = $ac_status" >&5
+  echo "$as_me:22012: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -21917,7 +22019,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21920 "configure"
+#line 22022 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21942,15 +22044,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21948: \$? = $ac_status" >&5
+  echo "$as_me:22050: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21953: \$? = $ac_status" >&5
+  echo "$as_me:22055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21964,17 +22066,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:21967: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22069: 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:21974: checking if we have identified curses libraries" >&5
+echo "$as_me:22076: 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 21977 "configure"
+#line 22079 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21986,16 +22088,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21989: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21992: \$? = $ac_status" >&5
+  echo "$as_me:22094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21998: \$? = $ac_status" >&5
+  echo "$as_me:22100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22004,13 +22106,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:22007: result: $cf_result" >&5
+echo "$as_me:22109: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:22013: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:22115: 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
@@ -22018,7 +22120,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22021 "configure"
+#line 22123 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22037,16 +22139,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22142: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22043: \$? = $ac_status" >&5
+  echo "$as_me:22145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22049: \$? = $ac_status" >&5
+  echo "$as_me:22151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22057,7 +22159,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22060: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22162: 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
 
@@ -22087,7 +22189,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:22090: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:22192: 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
@@ -22095,7 +22197,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22098 "configure"
+#line 22200 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22114,16 +22216,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22120: \$? = $ac_status" >&5
+  echo "$as_me:22222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22126: \$? = $ac_status" >&5
+  echo "$as_me:22228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -22134,7 +22236,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22137: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:22239: 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
 
@@ -22158,7 +22260,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:22161: checking for initscr in -lHcurses" >&5
+		echo "$as_me:22263: 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
@@ -22166,7 +22268,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22169 "configure"
+#line 22271 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22185,16 +22287,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22191: \$? = $ac_status" >&5
+  echo "$as_me:22293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22197: \$? = $ac_status" >&5
+  echo "$as_me:22299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -22205,7 +22307,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22208: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:22310: 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
 
@@ -22263,7 +22365,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}:22266: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22368: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22292,7 +22394,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}:22295: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22397: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22323,7 +22425,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}:22326: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22428: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22358,7 +22460,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}:22361: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22463: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22402,13 +22504,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:22405: checking for tgoto" >&5
+		echo "$as_me:22507: 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 22411 "configure"
+#line 22513 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22439,16 +22541,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22442: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22445: \$? = $ac_status" >&5
+  echo "$as_me:22547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22451: \$? = $ac_status" >&5
+  echo "$as_me:22553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -22458,7 +22560,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22461: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:22563: 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
@@ -22467,7 +22569,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:22470: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:22572: 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
@@ -22475,7 +22577,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22478 "configure"
+#line 22580 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22494,16 +22596,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22500: \$? = $ac_status" >&5
+  echo "$as_me:22602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22506: \$? = $ac_status" >&5
+  echo "$as_me:22608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -22514,7 +22616,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22517: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:22619: 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
 
@@ -22537,10 +22639,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:22540: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:22642: 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 22543 "configure"
+#line 22645 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22552,16 +22654,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22657: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22558: \$? = $ac_status" >&5
+  echo "$as_me:22660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22564: \$? = $ac_status" >&5
+  echo "$as_me:22666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22570,16 +22672,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:22573: result: $cf_result" >&5
+				echo "$as_me:22675: 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:22579: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:22681: 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 22582 "configure"
+#line 22684 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22591,16 +22693,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22597: \$? = $ac_status" >&5
+  echo "$as_me:22699: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22603: \$? = $ac_status" >&5
+  echo "$as_me:22705: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -22609,7 +22711,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 22612 "configure"
+#line 22714 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22621,16 +22723,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22627: \$? = $ac_status" >&5
+  echo "$as_me:22729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22633: \$? = $ac_status" >&5
+  echo "$as_me:22735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22642,19 +22744,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:22645: result: $cf_result" >&5
+				echo "$as_me:22747: 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:22651: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:22753: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
 
-echo "$as_me:22657: checking for curses performance tradeoff" >&5
+echo "$as_me:22759: 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
@@ -22662,7 +22764,7 @@ else
 
     cf_cv_curs_performance=no
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 22665 "configure"
+#line 22767 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22681,20 +22783,20 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22687: \$? = $ac_status" >&5
+  echo "$as_me:22789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22693: \$? = $ac_status" >&5
+  echo "$as_me:22795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22697 "configure"
+#line 22799 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -22714,16 +22816,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22720: \$? = $ac_status" >&5
+  echo "$as_me:22822: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22726: \$? = $ac_status" >&5
+  echo "$as_me:22828: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -22738,21 +22840,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22741: result: $cf_cv_curs_performance" >&5
+echo "$as_me:22843: 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:22748: checking for curses touchline function" >&5
+echo "$as_me:22850: 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 22755 "configure"
+#line 22857 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22765,23 +22867,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22771: \$? = $ac_status" >&5
+  echo "$as_me:22873: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22777: \$? = $ac_status" >&5
+  echo "$as_me:22879: \$? = $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 22784 "configure"
+#line 22886 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22794,16 +22896,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22800: \$? = $ac_status" >&5
+  echo "$as_me:22902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22806: \$? = $ac_status" >&5
+  echo "$as_me:22908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -22815,7 +22917,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:22818: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:22920: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -22840,23 +22942,23 @@ esac
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22843: checking for $ac_header" >&5
+echo "$as_me:22945: 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 22849 "configure"
+#line 22951 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22853: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22955: \"$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:22859: \$? = $ac_status" >&5
+  echo "$as_me:22961: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22875,7 +22977,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22878: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22980: 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
@@ -22885,7 +22987,7 @@ EOF
 fi
 done
 
-echo "$as_me:22888: checking for multibyte character support" >&5
+echo "$as_me:22990: 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
@@ -22893,7 +22995,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22896 "configure"
+#line 22998 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -22911,16 +23013,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22917: \$? = $ac_status" >&5
+  echo "$as_me:23019: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22923: \$? = $ac_status" >&5
+  echo "$as_me:23025: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -22932,12 +23034,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:22935: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23037: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22940 "configure"
+#line 23042 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22950,16 +23052,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22956: \$? = $ac_status" >&5
+  echo "$as_me:23058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22962: \$? = $ac_status" >&5
+  echo "$as_me:23064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -22973,7 +23075,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22976 "configure"
+#line 23078 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22986,16 +23088,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22989: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22992: \$? = $ac_status" >&5
+  echo "$as_me:23094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22998: \$? = $ac_status" >&5
+  echo "$as_me:23100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -23012,9 +23114,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:23015: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:23117: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:23017: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23119: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23105,7 +23207,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}:23108: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23210: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -23113,7 +23215,7 @@ echo "${as_me:-configure}:23108: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23116 "configure"
+#line 23218 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23126,21 +23228,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23132: \$? = $ac_status" >&5
+  echo "$as_me:23234: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23138: \$? = $ac_status" >&5
+  echo "$as_me:23240: \$? = $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}:23143: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23245: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23158,7 +23260,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:23161: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23263: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -23233,13 +23335,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}:23236: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23338: 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 23242 "configure"
+#line 23344 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23252,21 +23354,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23258: \$? = $ac_status" >&5
+  echo "$as_me:23360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23264: \$? = $ac_status" >&5
+  echo "$as_me:23366: \$? = $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}:23269: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23371: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -23308,7 +23410,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23311: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:23413: 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
@@ -23346,7 +23448,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 23349 "configure"
+#line 23451 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23358,16 +23460,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23463: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23364: \$? = $ac_status" >&5
+  echo "$as_me:23466: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23370: \$? = $ac_status" >&5
+  echo "$as_me:23472: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -23384,7 +23486,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}:23387: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23489: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23420,7 +23522,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}:23423: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23525: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -23450,13 +23552,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:23453: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:23555: 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:23456: result: yes" >&5
+		echo "$as_me:23558: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:23459: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:23561: 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
 
@@ -23589,7 +23691,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23592 "configure"
+#line 23694 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23601,37 +23703,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23607: \$? = $ac_status" >&5
+  echo "$as_me:23709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23613: \$? = $ac_status" >&5
+  echo "$as_me:23715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23619 "configure"
+#line 23721 "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:23626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23629: \$? = $ac_status" >&5
+  echo "$as_me:23731: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23634: \$? = $ac_status" >&5
+  echo "$as_me:23736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -23805,7 +23907,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23808 "configure"
+#line 23910 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23817,37 +23919,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23823: \$? = $ac_status" >&5
+  echo "$as_me:23925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23829: \$? = $ac_status" >&5
+  echo "$as_me:23931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23835 "configure"
+#line 23937 "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:23842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23845: \$? = $ac_status" >&5
+  echo "$as_me:23947: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23850: \$? = $ac_status" >&5
+  echo "$as_me:23952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -23864,7 +23966,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:23867: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:23969: 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"
@@ -23880,7 +23982,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:23883: checking for terminfo header" >&5
+echo "$as_me:23985: 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
@@ -23898,7 +24000,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23901 "configure"
+#line 24003 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -23913,16 +24015,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23919: \$? = $ac_status" >&5
+  echo "$as_me:24021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23925: \$? = $ac_status" >&5
+  echo "$as_me:24027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -23938,7 +24040,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23941: result: $cf_cv_term_header" >&5
+echo "$as_me:24043: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -23973,7 +24075,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:23976: result: no" >&5
+		echo "$as_me:24078: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -23989,7 +24091,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:23992: checking for $ac_word" >&5
+echo "$as_me:24094: 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
@@ -24004,7 +24106,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:24007: found $ac_dir/$ac_word" >&5
+echo "$as_me:24109: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24012,10 +24114,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:24015: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:24117: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24018: result: no" >&5
+  echo "$as_me:24120: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24028,7 +24130,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:24031: checking for $ac_word" >&5
+echo "$as_me:24133: 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
@@ -24043,7 +24145,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:24046: found $ac_dir/$ac_word" >&5
+echo "$as_me:24148: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24051,10 +24153,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:24054: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:24156: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24057: result: no" >&5
+  echo "$as_me:24159: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24211,7 +24313,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:24214: checking if we have identified curses headers" >&5
+echo "$as_me:24316: 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
@@ -24223,7 +24325,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24226 "configure"
+#line 24328 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -24235,16 +24337,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24340: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24241: \$? = $ac_status" >&5
+  echo "$as_me:24343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24247: \$? = $ac_status" >&5
+  echo "$as_me:24349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -24255,11 +24357,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24258: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:24360: 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:24262: error: No curses header-files found" >&5
+	{ { echo "$as_me:24364: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24269,23 +24371,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:24272: checking for $ac_header" >&5
+echo "$as_me:24374: 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 24278 "configure"
+#line 24380 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24384: \"$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:24288: \$? = $ac_status" >&5
+  echo "$as_me:24390: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24304,7 +24406,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24307: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24409: 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
@@ -24360,7 +24462,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 24363 "configure"
+#line 24465 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24372,16 +24474,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24378: \$? = $ac_status" >&5
+  echo "$as_me:24480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24384: \$? = $ac_status" >&5
+  echo "$as_me:24486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24398,7 +24500,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}:24401: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24503: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24417,7 +24519,7 @@ fi
 
 }
 
-echo "$as_me:24420: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:24522: 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
@@ -24429,7 +24531,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24432 "configure"
+#line 24534 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24453,16 +24555,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24558: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24459: \$? = $ac_status" >&5
+  echo "$as_me:24561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24465: \$? = $ac_status" >&5
+  echo "$as_me:24567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -24477,14 +24579,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:24480: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:24582: 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:24487: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:24589: 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
@@ -24605,7 +24707,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24608 "configure"
+#line 24710 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24617,16 +24719,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24623: \$? = $ac_status" >&5
+  echo "$as_me:24725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24629: \$? = $ac_status" >&5
+  echo "$as_me:24731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24643,7 +24745,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}:24646: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24748: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24666,7 +24768,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24669 "configure"
+#line 24771 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24690,16 +24792,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24696: \$? = $ac_status" >&5
+  echo "$as_me:24798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24702: \$? = $ac_status" >&5
+  echo "$as_me:24804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -24720,12 +24822,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:24723: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24825: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:24728: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:24830: 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%/[^/]*$%%'`
@@ -24761,7 +24863,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24764 "configure"
+#line 24866 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24773,16 +24875,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24779: \$? = $ac_status" >&5
+  echo "$as_me:24881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24785: \$? = $ac_status" >&5
+  echo "$as_me:24887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24799,7 +24901,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}:24802: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24904: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24847,7 +24949,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:24850: checking for terminfo header" >&5
+echo "$as_me:24952: 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
@@ -24865,7 +24967,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24868 "configure"
+#line 24970 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -24880,16 +24982,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24886: \$? = $ac_status" >&5
+  echo "$as_me:24988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24892: \$? = $ac_status" >&5
+  echo "$as_me:24994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -24905,7 +25007,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24908: result: $cf_cv_term_header" >&5
+echo "$as_me:25010: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -24943,7 +25045,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:24946: checking for ncurses version" >&5
+echo "$as_me:25048: 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
@@ -24969,10 +25071,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:24972: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:25074: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:24975: \$? = $ac_status" >&5
+  echo "$as_me:25077: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -24982,7 +25084,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24985 "configure"
+#line 25087 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -25007,15 +25109,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:25010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25013: \$? = $ac_status" >&5
+  echo "$as_me:25115: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25018: \$? = $ac_status" >&5
+  echo "$as_me:25120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -25029,7 +25131,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:25032: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:25134: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -25042,7 +25144,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:25045: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:25147: 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
@@ -25050,7 +25152,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25053 "configure"
+#line 25155 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25069,16 +25171,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25075: \$? = $ac_status" >&5
+  echo "$as_me:25177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25081: \$? = $ac_status" >&5
+  echo "$as_me:25183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -25089,10 +25191,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25092: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:25194: 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:25095: checking for initscr in -lgpm" >&5
+  echo "$as_me:25197: 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
@@ -25100,7 +25202,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25103 "configure"
+#line 25205 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25119,16 +25221,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25125: \$? = $ac_status" >&5
+  echo "$as_me:25227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25131: \$? = $ac_status" >&5
+  echo "$as_me:25233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -25139,7 +25241,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25142: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:25244: 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"
@@ -25154,7 +25256,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:25157: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:25259: 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
@@ -25162,7 +25264,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25165 "configure"
+#line 25267 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25181,16 +25283,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25187: \$? = $ac_status" >&5
+  echo "$as_me:25289: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25193: \$? = $ac_status" >&5
+  echo "$as_me:25295: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -25201,7 +25303,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25204: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:25306: 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"
@@ -25250,13 +25352,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:25253: checking for initscr" >&5
+	echo "$as_me:25355: 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 25259 "configure"
+#line 25361 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25287,16 +25389,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25392: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25293: \$? = $ac_status" >&5
+  echo "$as_me:25395: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25299: \$? = $ac_status" >&5
+  echo "$as_me:25401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -25306,18 +25408,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:25309: result: $ac_cv_func_initscr" >&5
+echo "$as_me:25411: 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:25316: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:25418: 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 25320 "configure"
+#line 25422 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25329,25 +25431,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25335: \$? = $ac_status" >&5
+  echo "$as_me:25437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25341: \$? = $ac_status" >&5
+  echo "$as_me:25443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25343: result: yes" >&5
+  echo "$as_me:25445: 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:25350: result: no" >&5
+echo "$as_me:25452: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25415,11 +25517,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25418: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:25520: 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 25422 "configure"
+#line 25524 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25431,25 +25533,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25437: \$? = $ac_status" >&5
+  echo "$as_me:25539: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25443: \$? = $ac_status" >&5
+  echo "$as_me:25545: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25445: result: yes" >&5
+  echo "$as_me:25547: 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:25452: result: no" >&5
+echo "$as_me:25554: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25464,7 +25566,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:25467: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:25569: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25472,7 +25574,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:25475: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:25577: 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
@@ -25482,7 +25584,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25485 "configure"
+#line 25587 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25494,23 +25596,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25500: \$? = $ac_status" >&5
+  echo "$as_me:25602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25506: \$? = $ac_status" >&5
+  echo "$as_me:25608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25508: result: yes" >&5
+  echo "$as_me:25610: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:25513: result: no" >&5
+echo "$as_me:25615: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -25536,13 +25638,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:25539: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:25641: 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:25542: result: yes" >&5
+		echo "$as_me:25644: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:25545: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:25647: 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
 
@@ -25675,7 +25777,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 25678 "configure"
+#line 25780 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25687,37 +25789,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25693: \$? = $ac_status" >&5
+  echo "$as_me:25795: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25699: \$? = $ac_status" >&5
+  echo "$as_me:25801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25705 "configure"
+#line 25807 "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:25712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25715: \$? = $ac_status" >&5
+  echo "$as_me:25817: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25720: \$? = $ac_status" >&5
+  echo "$as_me:25822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -25891,7 +25993,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25894 "configure"
+#line 25996 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25903,37 +26005,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25909: \$? = $ac_status" >&5
+  echo "$as_me:26011: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25915: \$? = $ac_status" >&5
+  echo "$as_me:26017: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25921 "configure"
+#line 26023 "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:25928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25931: \$? = $ac_status" >&5
+  echo "$as_me:26033: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25936: \$? = $ac_status" >&5
+  echo "$as_me:26038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -25950,7 +26052,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:25953: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:26055: 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"
@@ -25966,7 +26068,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:25969: checking for terminfo header" >&5
+echo "$as_me:26071: 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
@@ -25984,7 +26086,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25987 "configure"
+#line 26089 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -25999,16 +26101,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26005: \$? = $ac_status" >&5
+  echo "$as_me:26107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26011: \$? = $ac_status" >&5
+  echo "$as_me:26113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -26024,7 +26126,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26027: result: $cf_cv_term_header" >&5
+echo "$as_me:26129: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -26059,7 +26161,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:26062: result: no" >&5
+		echo "$as_me:26164: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -26075,7 +26177,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:26078: checking for $ac_word" >&5
+echo "$as_me:26180: 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
@@ -26090,7 +26192,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:26093: found $ac_dir/$ac_word" >&5
+echo "$as_me:26195: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26098,10 +26200,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:26101: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:26203: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26104: result: no" >&5
+  echo "$as_me:26206: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26114,7 +26216,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:26117: checking for $ac_word" >&5
+echo "$as_me:26219: 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
@@ -26129,7 +26231,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:26132: found $ac_dir/$ac_word" >&5
+echo "$as_me:26234: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26137,10 +26239,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:26140: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:26242: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26143: result: no" >&5
+  echo "$as_me:26245: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26297,7 +26399,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:26300: checking if we have identified curses headers" >&5
+echo "$as_me:26402: 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
@@ -26309,7 +26411,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26312 "configure"
+#line 26414 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -26321,16 +26423,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26327: \$? = $ac_status" >&5
+  echo "$as_me:26429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26333: \$? = $ac_status" >&5
+  echo "$as_me:26435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -26341,11 +26443,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26344: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:26446: 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:26348: error: No curses header-files found" >&5
+	{ { echo "$as_me:26450: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26355,23 +26457,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:26358: checking for $ac_header" >&5
+echo "$as_me:26460: 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 26364 "configure"
+#line 26466 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26368: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26470: \"$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:26374: \$? = $ac_status" >&5
+  echo "$as_me:26476: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26390,7 +26492,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26393: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26495: 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
@@ -26446,7 +26548,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 26449 "configure"
+#line 26551 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26458,16 +26560,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26464: \$? = $ac_status" >&5
+  echo "$as_me:26566: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26470: \$? = $ac_status" >&5
+  echo "$as_me:26572: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26484,7 +26586,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}:26487: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26589: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26503,7 +26605,7 @@ fi
 
 }
 
-echo "$as_me:26506: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:26608: 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
@@ -26515,7 +26617,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26518 "configure"
+#line 26620 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26539,16 +26641,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26545: \$? = $ac_status" >&5
+  echo "$as_me:26647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26551: \$? = $ac_status" >&5
+  echo "$as_me:26653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -26563,14 +26665,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:26566: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:26668: 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:26573: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:26675: 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
@@ -26691,7 +26793,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26694 "configure"
+#line 26796 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26703,16 +26805,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26709: \$? = $ac_status" >&5
+  echo "$as_me:26811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26715: \$? = $ac_status" >&5
+  echo "$as_me:26817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26729,7 +26831,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}:26732: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26834: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26752,7 +26854,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26755 "configure"
+#line 26857 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26776,16 +26878,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26782: \$? = $ac_status" >&5
+  echo "$as_me:26884: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26788: \$? = $ac_status" >&5
+  echo "$as_me:26890: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -26806,12 +26908,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:26809: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26911: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:26814: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:26916: 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%/[^/]*$%%'`
@@ -26847,7 +26949,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26850 "configure"
+#line 26952 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26859,16 +26961,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26865: \$? = $ac_status" >&5
+  echo "$as_me:26967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26871: \$? = $ac_status" >&5
+  echo "$as_me:26973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26885,7 +26987,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}:26888: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26990: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26933,7 +27035,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26936: checking for terminfo header" >&5
+echo "$as_me:27038: 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
@@ -26951,7 +27053,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26954 "configure"
+#line 27056 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -26966,16 +27068,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26969: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26972: \$? = $ac_status" >&5
+  echo "$as_me:27074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26978: \$? = $ac_status" >&5
+  echo "$as_me:27080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -26991,7 +27093,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26994: result: $cf_cv_term_header" >&5
+echo "$as_me:27096: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -27029,7 +27131,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:27032: checking for ncurses version" >&5
+echo "$as_me:27134: 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
@@ -27055,10 +27157,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:27058: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:27160: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:27061: \$? = $ac_status" >&5
+  echo "$as_me:27163: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -27068,7 +27170,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27071 "configure"
+#line 27173 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -27093,15 +27195,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27099: \$? = $ac_status" >&5
+  echo "$as_me:27201: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27104: \$? = $ac_status" >&5
+  echo "$as_me:27206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -27115,7 +27217,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:27118: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:27220: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -27128,7 +27230,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:27131: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:27233: 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
@@ -27136,7 +27238,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27139 "configure"
+#line 27241 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27155,16 +27257,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27161: \$? = $ac_status" >&5
+  echo "$as_me:27263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27167: \$? = $ac_status" >&5
+  echo "$as_me:27269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -27175,10 +27277,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27178: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:27280: 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:27181: checking for initscr in -lgpm" >&5
+  echo "$as_me:27283: 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
@@ -27186,7 +27288,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27189 "configure"
+#line 27291 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27205,16 +27307,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27211: \$? = $ac_status" >&5
+  echo "$as_me:27313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27217: \$? = $ac_status" >&5
+  echo "$as_me:27319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -27225,7 +27327,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27228: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:27330: 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"
@@ -27240,7 +27342,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:27243: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:27345: 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
@@ -27248,7 +27350,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27251 "configure"
+#line 27353 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27267,16 +27369,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27273: \$? = $ac_status" >&5
+  echo "$as_me:27375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27279: \$? = $ac_status" >&5
+  echo "$as_me:27381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -27287,7 +27389,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27290: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:27392: 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"
@@ -27336,13 +27438,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:27339: checking for initscr" >&5
+	echo "$as_me:27441: 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 27345 "configure"
+#line 27447 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -27373,16 +27475,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27478: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27379: \$? = $ac_status" >&5
+  echo "$as_me:27481: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27385: \$? = $ac_status" >&5
+  echo "$as_me:27487: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -27392,18 +27494,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:27395: result: $ac_cv_func_initscr" >&5
+echo "$as_me:27497: 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:27402: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:27504: 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 27406 "configure"
+#line 27508 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27415,25 +27517,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27421: \$? = $ac_status" >&5
+  echo "$as_me:27523: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27427: \$? = $ac_status" >&5
+  echo "$as_me:27529: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27429: result: yes" >&5
+  echo "$as_me:27531: 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:27436: result: no" >&5
+echo "$as_me:27538: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -27501,11 +27603,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:27504: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:27606: 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 27508 "configure"
+#line 27610 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27517,25 +27619,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27523: \$? = $ac_status" >&5
+  echo "$as_me:27625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27529: \$? = $ac_status" >&5
+  echo "$as_me:27631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27531: result: yes" >&5
+  echo "$as_me:27633: 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:27538: result: no" >&5
+echo "$as_me:27640: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -27550,7 +27652,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:27553: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:27655: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -27558,7 +27660,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:27561: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:27663: 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
@@ -27568,7 +27670,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27571 "configure"
+#line 27673 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27580,23 +27682,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27586: \$? = $ac_status" >&5
+  echo "$as_me:27688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27592: \$? = $ac_status" >&5
+  echo "$as_me:27694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27594: result: yes" >&5
+  echo "$as_me:27696: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:27599: result: no" >&5
+echo "$as_me:27701: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -27628,7 +27730,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:27631: checking for slang header file" >&5
+echo "$as_me:27733: 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
@@ -27636,7 +27738,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27639 "configure"
+#line 27741 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -27648,16 +27750,16 @@ printf("%s\\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27654: \$? = $ac_status" >&5
+  echo "$as_me:27756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27660: \$? = $ac_status" >&5
+  echo "$as_me:27762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -27762,7 +27864,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27765: result: $cf_cv_slang_header" >&5
+echo "$as_me:27867: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -27806,7 +27908,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 27809 "configure"
+#line 27911 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27818,16 +27920,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27824: \$? = $ac_status" >&5
+  echo "$as_me:27926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27830: \$? = $ac_status" >&5
+  echo "$as_me:27932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -27844,7 +27946,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}:27847: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:27949: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -27876,7 +27978,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27879 "configure"
+#line 27981 "configure"
 #include "confdefs.h"
 
 int
@@ -27888,19 +27990,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27894: \$? = $ac_status" >&5
+  echo "$as_me:27996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27900: \$? = $ac_status" >&5
+  echo "$as_me:28002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27903 "configure"
+#line 28005 "configure"
 #include "confdefs.h"
 
 int
@@ -27912,16 +28014,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27918: \$? = $ac_status" >&5
+  echo "$as_me:28020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27924: \$? = $ac_status" >&5
+  echo "$as_me:28026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -27932,7 +28034,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}:27935: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:28037: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -27947,10 +28049,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:27950: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:28052: 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 27953 "configure"
+#line 28055 "configure"
 #include "confdefs.h"
 
 int
@@ -27962,16 +28064,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27968: \$? = $ac_status" >&5
+  echo "$as_me:28070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27974: \$? = $ac_status" >&5
+  echo "$as_me:28076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -27980,7 +28082,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:27983: result: $cf_result" >&5
+			echo "$as_me:28085: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -27997,7 +28099,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:28000: checking for initscr in -lcurses" >&5
+	echo "$as_me:28102: 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
@@ -28005,7 +28107,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28008 "configure"
+#line 28110 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28024,16 +28126,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28030: \$? = $ac_status" >&5
+  echo "$as_me:28132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28036: \$? = $ac_status" >&5
+  echo "$as_me:28138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -28044,7 +28146,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28047: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:28149: 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
 
@@ -28066,7 +28168,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:28069: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:28171: 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
@@ -28074,7 +28176,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28077 "configure"
+#line 28179 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28093,16 +28195,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28099: \$? = $ac_status" >&5
+  echo "$as_me:28201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28105: \$? = $ac_status" >&5
+  echo "$as_me:28207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -28113,7 +28215,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28116: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:28218: 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
 
@@ -28140,20 +28242,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:28143: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:28245: 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:28150: checking for acos" >&5
+echo "$as_me:28252: 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 28156 "configure"
+#line 28258 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28184,16 +28286,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28190: \$? = $ac_status" >&5
+  echo "$as_me:28292: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28196: \$? = $ac_status" >&5
+  echo "$as_me:28298: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -28203,13 +28305,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28206: result: $ac_cv_func_acos" >&5
+echo "$as_me:28308: 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:28212: checking for acos in -lm" >&5
+echo "$as_me:28314: 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
@@ -28217,7 +28319,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28220 "configure"
+#line 28322 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28236,16 +28338,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28242: \$? = $ac_status" >&5
+  echo "$as_me:28344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28248: \$? = $ac_status" >&5
+  echo "$as_me:28350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -28256,7 +28358,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28259: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:28361: 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
 
@@ -28282,13 +28384,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:28285: checking for v_init" >&5
+	echo "$as_me:28387: 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 28291 "configure"
+#line 28393 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28319,16 +28421,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28325: \$? = $ac_status" >&5
+  echo "$as_me:28427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28331: \$? = $ac_status" >&5
+  echo "$as_me:28433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -28338,18 +28440,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28341: result: $ac_cv_func_v_init" >&5
+echo "$as_me:28443: 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:28348: checking for v_init in -lvideo" >&5
+		echo "$as_me:28450: 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 28352 "configure"
+#line 28454 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28361,25 +28463,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28367: \$? = $ac_status" >&5
+  echo "$as_me:28469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28373: \$? = $ac_status" >&5
+  echo "$as_me:28475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28375: result: yes" >&5
+  echo "$as_me:28477: 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:28382: result: no" >&5
+echo "$as_me:28484: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28447,11 +28549,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28450: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:28552: 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 28454 "configure"
+#line 28556 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28463,25 +28565,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28469: \$? = $ac_status" >&5
+  echo "$as_me:28571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28475: \$? = $ac_status" >&5
+  echo "$as_me:28577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28477: result: yes" >&5
+  echo "$as_me:28579: 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:28484: result: no" >&5
+echo "$as_me:28586: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28496,7 +28598,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28499: error: Cannot link video library" >&5
+	{ { echo "$as_me:28601: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -28506,13 +28608,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang"'=no'
 	cf_libdir=""
-	echo "$as_me:28509: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:28611: 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 28515 "configure"
+#line 28617 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28543,16 +28645,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28549: \$? = $ac_status" >&5
+  echo "$as_me:28651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28555: \$? = $ac_status" >&5
+  echo "$as_me:28657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -28562,18 +28664,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:28565: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:28667: 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:28572: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:28674: 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 28576 "configure"
+#line 28678 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28585,25 +28687,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28591: \$? = $ac_status" >&5
+  echo "$as_me:28693: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28597: \$? = $ac_status" >&5
+  echo "$as_me:28699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28599: result: yes" >&5
+  echo "$as_me:28701: 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:28606: result: no" >&5
+echo "$as_me:28708: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28671,11 +28773,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28674: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:28776: 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 28678 "configure"
+#line 28780 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28687,25 +28789,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28693: \$? = $ac_status" >&5
+  echo "$as_me:28795: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28699: \$? = $ac_status" >&5
+  echo "$as_me:28801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28701: result: yes" >&5
+  echo "$as_me:28803: 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:28708: result: no" >&5
+echo "$as_me:28810: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28720,13 +28822,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28723: error: Cannot link slang library" >&5
+	{ { echo "$as_me:28825: 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:28729: checking if we can link slang without termcap" >&5
+echo "$as_me:28831: 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%^.%%'`
@@ -28735,7 +28837,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28738 "configure"
+#line 28840 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28747,16 +28849,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28753: \$? = $ac_status" >&5
+  echo "$as_me:28855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28759: \$? = $ac_status" >&5
+  echo "$as_me:28861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28765,13 +28867,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:28768: result: $cf_result" >&5
+echo "$as_me:28870: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:28774: checking for slang2 header file" >&5
+echo "$as_me:28876: 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
@@ -28779,7 +28881,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28782 "configure"
+#line 28884 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28791,16 +28893,16 @@ printf("%s\\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28797: \$? = $ac_status" >&5
+  echo "$as_me:28899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28803: \$? = $ac_status" >&5
+  echo "$as_me:28905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -28905,7 +29007,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28908: result: $cf_cv_slang2_header" >&5
+echo "$as_me:29010: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -28949,7 +29051,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 28952 "configure"
+#line 29054 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28961,16 +29063,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28967: \$? = $ac_status" >&5
+  echo "$as_me:29069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28973: \$? = $ac_status" >&5
+  echo "$as_me:29075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -28987,7 +29089,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}:28990: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:29092: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29019,7 +29121,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29022 "configure"
+#line 29124 "configure"
 #include "confdefs.h"
 
 int
@@ -29031,19 +29133,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29037: \$? = $ac_status" >&5
+  echo "$as_me:29139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29043: \$? = $ac_status" >&5
+  echo "$as_me:29145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 29046 "configure"
+#line 29148 "configure"
 #include "confdefs.h"
 
 int
@@ -29055,16 +29157,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29061: \$? = $ac_status" >&5
+  echo "$as_me:29163: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29067: \$? = $ac_status" >&5
+  echo "$as_me:29169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -29075,7 +29177,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}:29078: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:29180: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -29090,10 +29192,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:29093: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:29195: 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 29096 "configure"
+#line 29198 "configure"
 #include "confdefs.h"
 
 int
@@ -29105,16 +29207,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29111: \$? = $ac_status" >&5
+  echo "$as_me:29213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29117: \$? = $ac_status" >&5
+  echo "$as_me:29219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -29123,7 +29225,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:29126: result: $cf_result" >&5
+			echo "$as_me:29228: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -29140,7 +29242,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:29143: checking for initscr in -lcurses" >&5
+	echo "$as_me:29245: 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
@@ -29148,7 +29250,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29151 "configure"
+#line 29253 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29167,16 +29269,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29173: \$? = $ac_status" >&5
+  echo "$as_me:29275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29179: \$? = $ac_status" >&5
+  echo "$as_me:29281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -29187,7 +29289,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29190: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:29292: 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
 
@@ -29209,7 +29311,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:29212: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:29314: 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
@@ -29217,7 +29319,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29220 "configure"
+#line 29322 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29236,16 +29338,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29242: \$? = $ac_status" >&5
+  echo "$as_me:29344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29248: \$? = $ac_status" >&5
+  echo "$as_me:29350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -29256,7 +29358,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29259: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:29361: 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
 
@@ -29283,20 +29385,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:29286: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:29388: 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:29293: checking for acos" >&5
+echo "$as_me:29395: 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 29299 "configure"
+#line 29401 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29327,16 +29429,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29333: \$? = $ac_status" >&5
+  echo "$as_me:29435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29339: \$? = $ac_status" >&5
+  echo "$as_me:29441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -29346,13 +29448,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29349: result: $ac_cv_func_acos" >&5
+echo "$as_me:29451: 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:29355: checking for acos in -lm" >&5
+echo "$as_me:29457: 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
@@ -29360,7 +29462,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29363 "configure"
+#line 29465 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29379,16 +29481,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29385: \$? = $ac_status" >&5
+  echo "$as_me:29487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29391: \$? = $ac_status" >&5
+  echo "$as_me:29493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -29399,7 +29501,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29402: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:29504: 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
 
@@ -29425,13 +29527,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:29428: checking for v_init" >&5
+	echo "$as_me:29530: 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 29434 "configure"
+#line 29536 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29462,16 +29564,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29468: \$? = $ac_status" >&5
+  echo "$as_me:29570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29474: \$? = $ac_status" >&5
+  echo "$as_me:29576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -29481,18 +29583,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29484: result: $ac_cv_func_v_init" >&5
+echo "$as_me:29586: 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:29491: checking for v_init in -lvideo" >&5
+		echo "$as_me:29593: 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 29495 "configure"
+#line 29597 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29504,25 +29606,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29510: \$? = $ac_status" >&5
+  echo "$as_me:29612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29516: \$? = $ac_status" >&5
+  echo "$as_me:29618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29518: result: yes" >&5
+  echo "$as_me:29620: 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:29525: result: no" >&5
+echo "$as_me:29627: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29590,11 +29692,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29593: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:29695: 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 29597 "configure"
+#line 29699 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29606,25 +29708,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29612: \$? = $ac_status" >&5
+  echo "$as_me:29714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29618: \$? = $ac_status" >&5
+  echo "$as_me:29720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29620: result: yes" >&5
+  echo "$as_me:29722: 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:29627: result: no" >&5
+echo "$as_me:29729: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29639,7 +29741,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29642: error: Cannot link video library" >&5
+	{ { echo "$as_me:29744: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -29649,13 +29751,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang2"'=no'
 	cf_libdir=""
-	echo "$as_me:29652: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:29754: 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 29658 "configure"
+#line 29760 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29686,16 +29788,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29692: \$? = $ac_status" >&5
+  echo "$as_me:29794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29698: \$? = $ac_status" >&5
+  echo "$as_me:29800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -29705,18 +29807,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:29708: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:29810: 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:29715: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:29817: 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 29719 "configure"
+#line 29821 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29728,25 +29830,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29833: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29734: \$? = $ac_status" >&5
+  echo "$as_me:29836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29740: \$? = $ac_status" >&5
+  echo "$as_me:29842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29742: result: yes" >&5
+  echo "$as_me:29844: 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:29749: result: no" >&5
+echo "$as_me:29851: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29814,11 +29916,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29817: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:29919: 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 29821 "configure"
+#line 29923 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29830,25 +29932,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29836: \$? = $ac_status" >&5
+  echo "$as_me:29938: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29842: \$? = $ac_status" >&5
+  echo "$as_me:29944: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29844: result: yes" >&5
+  echo "$as_me:29946: 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:29851: result: no" >&5
+echo "$as_me:29953: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29863,13 +29965,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang2"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29866: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:29968: 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:29872: checking if we can link slang2 without termcap" >&5
+echo "$as_me:29974: 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%^.%%'`
@@ -29878,7 +29980,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29881 "configure"
+#line 29983 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29890,16 +29992,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29896: \$? = $ac_status" >&5
+  echo "$as_me:29998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29902: \$? = $ac_status" >&5
+  echo "$as_me:30004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -29908,12 +30010,12 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:29911: result: $cf_result" >&5
+echo "$as_me:30013: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:29916: error: cannot find slang headers" >&5
+		{ { echo "$as_me:30018: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29921,14 +30023,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:29924: checking if we must define UTF8" >&5
+echo "$as_me:30026: 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 29931 "configure"
+#line 30033 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29940,16 +30042,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29946: \$? = $ac_status" >&5
+  echo "$as_me:30048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29952: \$? = $ac_status" >&5
+  echo "$as_me:30054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -29957,7 +30059,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29960 "configure"
+#line 30062 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -29971,16 +30073,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30076: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29977: \$? = $ac_status" >&5
+  echo "$as_me:30079: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29983: \$? = $ac_status" >&5
+  echo "$as_me:30085: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -29993,7 +30095,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:29996: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:30098: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -30004,14 +30106,14 @@ EOF
 
 fi
 
-echo "$as_me:30007: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:30109: 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 30014 "configure"
+#line 30116 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -30030,16 +30132,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30036: \$? = $ac_status" >&5
+  echo "$as_me:30138: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30042: \$? = $ac_status" >&5
+  echo "$as_me:30144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -30050,20 +30152,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:30053: result: $cf_cv_slang_unix" >&5
+echo "$as_me:30155: 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:30060: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:30162: 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 30066 "configure"
+#line 30168 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30079,16 +30181,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30184: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30085: \$? = $ac_status" >&5
+  echo "$as_me:30187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30091: \$? = $ac_status" >&5
+  echo "$as_me:30193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -30098,7 +30200,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30101: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:30203: 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
@@ -30114,13 +30216,13 @@ EOF
 
 fi
 
-	echo "$as_me:30117: checking for SLtt_Char_Type" >&5
+	echo "$as_me:30219: 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 30123 "configure"
+#line 30225 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30136,16 +30238,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30139: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30142: \$? = $ac_status" >&5
+  echo "$as_me:30244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30148: \$? = $ac_status" >&5
+  echo "$as_me:30250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -30155,7 +30257,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30158: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:30260: 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
@@ -30178,7 +30280,7 @@ esac
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:30181: checking for an rpath option" >&5
+	echo "$as_me:30283: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -30209,12 +30311,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:30212: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:30314: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:30217: checking if we need a space after rpath option" >&5
+		echo "$as_me:30319: 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"
 
@@ -30235,7 +30337,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 30238 "configure"
+#line 30340 "configure"
 #include "confdefs.h"
 
 int
@@ -30247,16 +30349,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30253: \$? = $ac_status" >&5
+  echo "$as_me:30355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30259: \$? = $ac_status" >&5
+  echo "$as_me:30361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -30266,7 +30368,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:30269: result: $cf_rpath_space" >&5
+		echo "$as_me:30371: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -30277,13 +30379,13 @@ if test -z "$LD_RPATH_OPT"
 then
 	test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30280: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30382: 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}:30286: testing rpath is disabled ..." 1>&5
+echo "${as_me:-configure}:30388: testing rpath is disabled ..." 1>&5
 
 elif test -z "${LD_RUN_PATH}${LD_LIBRARY_PATH}"
 then
@@ -30294,7 +30396,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30297 "configure"
+#line 30399 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -30303,15 +30405,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30309: \$? = $ac_status" >&5
+  echo "$as_me:30411: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30314: \$? = $ac_status" >&5
+  echo "$as_me:30416: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30327,7 +30429,7 @@ fi
 		then
 			test -n "$verbose" && echo "	linkage is broken" 1>&6
 
-echo "${as_me:-configure}:30330: testing linkage is broken ..." 1>&5
+echo "${as_me:-configure}:30432: testing linkage is broken ..." 1>&5
 
 			cf_result=
 			for cf_item in $LIBS
@@ -30359,7 +30461,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30362 "configure"
+#line 30464 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -30368,15 +30470,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30374: \$? = $ac_status" >&5
+  echo "$as_me:30476: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30379: \$? = $ac_status" >&5
+  echo "$as_me:30481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30392,12 +30494,12 @@ fi
 				then
 					test -n "$verbose" && echo "	use rpath for $cf_save_LIBS" 1>&6
 
-echo "${as_me:-configure}:30395: testing use rpath for $cf_save_LIBS ..." 1>&5
+echo "${as_me:-configure}:30497: 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}:30400: testing result is now $LIBS ..." 1>&5
+echo "${as_me:-configure}:30502: testing result is now $LIBS ..." 1>&5
 
 				else
 					LIBS="$cf_save_LIBS"
@@ -30408,20 +30510,20 @@ echo "${as_me:-configure}:30400: testing result is now $LIBS ..." 1>&5
 	(*)
 		test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30411: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30513: testing will not attempt to use rpath ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:30417: checking for chtype typedef" >&5
+echo "$as_me:30519: 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 30424 "configure"
+#line 30526 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30433,16 +30535,16 @@ chtype foo; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30439: \$? = $ac_status" >&5
+  echo "$as_me:30541: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30445: \$? = $ac_status" >&5
+  echo "$as_me:30547: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -30452,7 +30554,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30455: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:30557: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test "$cf_cv_chtype_decl" = yes ; then
 
@@ -30460,14 +30562,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:30463: checking if chtype is scalar or struct" >&5
+	echo "$as_me:30565: 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 30470 "configure"
+#line 30572 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30479,16 +30581,16 @@ static chtype foo; long x = foo; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30584: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30485: \$? = $ac_status" >&5
+  echo "$as_me:30587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30491: \$? = $ac_status" >&5
+  echo "$as_me:30593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -30498,7 +30600,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30501: result: $cf_cv_chtype_type" >&5
+echo "$as_me:30603: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test "$cf_cv_chtype_type" = scalar ; then
 
@@ -30509,7 +30611,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:30512: checking if you want the wide-curses features" >&5
+echo "$as_me:30614: 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.
@@ -30526,10 +30628,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:30529: result: $use_wide_curses" >&5
+echo "$as_me:30631: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:30532: checking if color-style code should be used" >&5
+echo "$as_me:30634: 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.
@@ -30549,7 +30651,7 @@ fi;
 
 case "$use_color_style" in
 (no)
-	echo "$as_me:30552: result: no" >&5
+	echo "$as_me:30654: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -30559,10 +30661,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:30562: result: yes" >&5
+	echo "$as_me:30664: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:30565: checking for location of style-sheet file" >&5
+	echo "$as_me:30667: 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.
@@ -30598,7 +30700,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30601: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30703: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30607,7 +30709,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:30610: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:30712: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -30620,7 +30722,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:30623: checking for the default configuration-file" >&5
+echo "$as_me:30725: 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.
@@ -30656,7 +30758,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30659: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30761: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30665,7 +30767,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:30668: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:30770: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -30674,7 +30776,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:30677: checking for the default configuration-path" >&5
+echo "$as_me:30779: 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.
@@ -30710,7 +30812,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30713: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30815: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30719,7 +30821,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:30722: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:30824: 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%/[^/]*$%%'`"
@@ -30729,7 +30831,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:30732: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:30834: 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.
@@ -30746,7 +30848,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:30749: result: $use_htmlized_cfg" >&5
+echo "$as_me:30851: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -30757,7 +30859,7 @@ else
 	LYNXCFG_NO_MAKE='#'
 fi
 
-echo "$as_me:30760: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:30862: 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.
@@ -30774,7 +30876,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:30777: result: $use_local_docs" >&5
+echo "$as_me:30879: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -30782,7 +30884,7 @@ if test "$use_local_docs" = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:30785: checking for MIME library directory" >&5
+echo "$as_me:30887: 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.
@@ -30818,7 +30920,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30821: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30923: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30827,7 +30929,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:30830: result: $MIME_LIBDIR" >&5
+echo "$as_me:30932: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -30835,7 +30937,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:30838: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:30940: 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.
@@ -30852,7 +30954,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:30855: result: $use_locale_charset" >&5
+echo "$as_me:30957: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test "$use_locale_charset" != no &&
 cat >>confdefs.h <<\EOF
@@ -30861,7 +30963,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:30864: checking if you want only a few charsets" >&5
+echo "$as_me:30966: 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.
@@ -30873,7 +30975,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:30876: result: yes" >&5
+	echo "$as_me:30978: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -30887,7 +30989,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}:30890: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:30992: 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'`
@@ -30914,28 +31016,28 @@ echo "${as_me:-configure}:30890: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:30917: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:31019: 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}:30923: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:31025: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:30928: result: no" >&5
+	echo "$as_me:31030: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:30932: checking for ANSI C header files" >&5
+echo "$as_me:31034: 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 30938 "configure"
+#line 31040 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -30943,13 +31045,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:30946: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31048: \"$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:30952: \$? = $ac_status" >&5
+  echo "$as_me:31054: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30971,7 +31073,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 30974 "configure"
+#line 31076 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -30989,7 +31091,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 30992 "configure"
+#line 31094 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -31010,7 +31112,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31013 "configure"
+#line 31115 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -31036,15 +31138,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31042: \$? = $ac_status" >&5
+  echo "$as_me:31144: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31047: \$? = $ac_status" >&5
+  echo "$as_me:31149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -31057,7 +31159,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:31060: result: $ac_cv_header_stdc" >&5
+echo "$as_me:31162: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -31067,13 +31169,13 @@ EOF
 
 fi
 
-echo "$as_me:31070: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:31172: 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 31076 "configure"
+#line 31178 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -31089,16 +31191,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31095: \$? = $ac_status" >&5
+  echo "$as_me:31197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31101: \$? = $ac_status" >&5
+  echo "$as_me:31203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -31108,7 +31210,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31111: result: $ac_cv_header_time" >&5
+echo "$as_me:31213: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -31121,13 +31223,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:31124: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:31226: 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 31130 "configure"
+#line 31232 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -31142,16 +31244,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31247: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31148: \$? = $ac_status" >&5
+  echo "$as_me:31250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31154: \$? = $ac_status" >&5
+  echo "$as_me:31256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -31161,7 +31263,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31164: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31266: 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
@@ -31174,7 +31276,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:31177: checking for opendir in -ldir" >&5
+  echo "$as_me:31279: 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
@@ -31182,7 +31284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31185 "configure"
+#line 31287 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31201,16 +31303,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31207: \$? = $ac_status" >&5
+  echo "$as_me:31309: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31213: \$? = $ac_status" >&5
+  echo "$as_me:31315: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -31221,14 +31323,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31224: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:31326: 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:31231: checking for opendir in -lx" >&5
+  echo "$as_me:31333: 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
@@ -31236,7 +31338,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31239 "configure"
+#line 31341 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31255,16 +31357,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31261: \$? = $ac_status" >&5
+  echo "$as_me:31363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31267: \$? = $ac_status" >&5
+  echo "$as_me:31369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -31275,7 +31377,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31278: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:31380: 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"
@@ -31304,23 +31406,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31307: checking for $ac_header" >&5
+echo "$as_me:31409: 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 31313 "configure"
+#line 31415 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31317: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31419: \"$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:31323: \$? = $ac_status" >&5
+  echo "$as_me:31425: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31339,7 +31441,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31342: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31444: 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
@@ -31349,14 +31451,14 @@ EOF
 fi
 done
 
-echo "$as_me:31352: checking termio.h and termios.h" >&5
+echo "$as_me:31454: 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 31359 "configure"
+#line 31461 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -31374,16 +31476,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31380: \$? = $ac_status" >&5
+  echo "$as_me:31482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31386: \$? = $ac_status" >&5
+  echo "$as_me:31488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -31394,21 +31496,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31397: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:31499: 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:31404: checking for sigaction and structs" >&5
+echo "$as_me:31506: 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 31411 "configure"
+#line 31513 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31428,16 +31530,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31434: \$? = $ac_status" >&5
+  echo "$as_me:31536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31440: \$? = $ac_status" >&5
+  echo "$as_me:31542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -31448,7 +31550,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:31451: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:31553: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31458,23 +31560,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:31461: checking for $ac_header" >&5
+echo "$as_me:31563: 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 31467 "configure"
+#line 31569 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31471: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31573: \"$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:31477: \$? = $ac_status" >&5
+  echo "$as_me:31579: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31493,7 +31595,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31496: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31598: 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
@@ -31514,23 +31616,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31517: checking for $ac_header" >&5
+echo "$as_me:31619: 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 31523 "configure"
+#line 31625 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31527: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31629: \"$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:31533: \$? = $ac_status" >&5
+  echo "$as_me:31635: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31549,7 +31651,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31552: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31654: 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
@@ -31562,23 +31664,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31565: checking for $ac_header" >&5
+echo "$as_me:31667: 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 31571 "configure"
+#line 31673 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31575: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31677: \"$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:31581: \$? = $ac_status" >&5
+  echo "$as_me:31683: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31597,7 +31699,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31600: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31702: 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
@@ -31619,14 +31721,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:31622: checking for union wait" >&5
+echo "$as_me:31724: 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 31629 "configure"
+#line 31731 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31645,16 +31747,16 @@ static int x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31651: \$? = $ac_status" >&5
+  echo "$as_me:31753: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31657: \$? = $ac_status" >&5
+  echo "$as_me:31759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -31664,7 +31766,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 31667 "configure"
+#line 31769 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31691,16 +31793,16 @@ union wait x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31697: \$? = $ac_status" >&5
+  echo "$as_me:31799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31703: \$? = $ac_status" >&5
+  echo "$as_me:31805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -31715,7 +31817,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31718: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:31820: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test "$cf_cv_type_unionwait" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31724,14 +31826,14 @@ EOF
 
 if test "$cf_cv_type_unionwait" = yes; then
 
-	echo "$as_me:31727: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:31829: 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 31734 "configure"
+#line 31836 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31743,16 +31845,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31749: \$? = $ac_status" >&5
+  echo "$as_me:31851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31755: \$? = $ac_status" >&5
+  echo "$as_me:31857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -31764,21 +31866,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31767: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:31869: 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:31774: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:31876: 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 31781 "configure"
+#line 31883 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31790,16 +31892,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31796: \$? = $ac_status" >&5
+  echo "$as_me:31898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31802: \$? = $ac_status" >&5
+  echo "$as_me:31904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -31811,7 +31913,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31814: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:31916: 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
@@ -31820,13 +31922,13 @@ EOF
 
 fi
 
-echo "$as_me:31823: checking for uid_t in sys/types.h" >&5
+echo "$as_me:31925: 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 31829 "configure"
+#line 31931 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -31840,7 +31942,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:31843: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:31945: 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
 
@@ -31854,7 +31956,7 @@ EOF
 
 fi
 
-echo "$as_me:31857: checking type of array argument to getgroups" >&5
+echo "$as_me:31959: 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
@@ -31863,7 +31965,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31866 "configure"
+#line 31968 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -31889,15 +31991,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31895: \$? = $ac_status" >&5
+  echo "$as_me:31997: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31900: \$? = $ac_status" >&5
+  echo "$as_me:32002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -31910,7 +32012,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 31913 "configure"
+#line 32015 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -31925,20 +32027,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:31928: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:32030: 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:31935: checking for off_t" >&5
+echo "$as_me:32037: 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 31941 "configure"
+#line 32043 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31953,16 +32055,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32058: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31959: \$? = $ac_status" >&5
+  echo "$as_me:32061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31965: \$? = $ac_status" >&5
+  echo "$as_me:32067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -31972,7 +32074,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31975: result: $ac_cv_type_off_t" >&5
+echo "$as_me:32077: 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
   :
@@ -31984,13 +32086,13 @@ EOF
 
 fi
 
-echo "$as_me:31987: checking for pid_t" >&5
+echo "$as_me:32089: 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 31993 "configure"
+#line 32095 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32005,16 +32107,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32011: \$? = $ac_status" >&5
+  echo "$as_me:32113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32017: \$? = $ac_status" >&5
+  echo "$as_me:32119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -32024,7 +32126,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32027: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:32129: 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
   :
@@ -32036,13 +32138,13 @@ EOF
 
 fi
 
-echo "$as_me:32039: checking for uid_t in sys/types.h" >&5
+echo "$as_me:32141: 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 32045 "configure"
+#line 32147 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -32056,7 +32158,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:32059: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:32161: 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
 
@@ -32070,13 +32172,13 @@ EOF
 
 fi
 
-echo "$as_me:32073: checking for mode_t" >&5
+echo "$as_me:32175: 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 32079 "configure"
+#line 32181 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32091,16 +32193,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32097: \$? = $ac_status" >&5
+  echo "$as_me:32199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32103: \$? = $ac_status" >&5
+  echo "$as_me:32205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -32110,7 +32212,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32113: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:32215: 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
   :
@@ -32122,13 +32224,13 @@ EOF
 
 fi
 
-	echo "$as_me:32125: checking for ssize_t" >&5
+	echo "$as_me:32227: 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 32131 "configure"
+#line 32233 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32143,16 +32245,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32149: \$? = $ac_status" >&5
+  echo "$as_me:32251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32155: \$? = $ac_status" >&5
+  echo "$as_me:32257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -32162,7 +32264,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32165: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:32267: 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
@@ -32178,13 +32280,13 @@ EOF
 
 fi
 
-	echo "$as_me:32181: checking for socklen_t" >&5
+	echo "$as_me:32283: 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 32187 "configure"
+#line 32289 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32202,16 +32304,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32208: \$? = $ac_status" >&5
+  echo "$as_me:32310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32214: \$? = $ac_status" >&5
+  echo "$as_me:32316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -32221,7 +32323,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32224: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:32326: 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
@@ -32237,7 +32339,7 @@ EOF
 
 fi
 
-echo "$as_me:32240: checking for long long type" >&5
+echo "$as_me:32342: 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
@@ -32268,7 +32370,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:32271: result: $cf_cv_type_long_long" >&5
+echo "$as_me:32373: 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
@@ -32279,14 +32381,14 @@ EOF
 
 fi
 
-echo "$as_me:32282: checking for tm.tm_gmtoff" >&5
+echo "$as_me:32384: 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 32289 "configure"
+#line 32391 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -32311,16 +32413,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32314: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32317: \$? = $ac_status" >&5
+  echo "$as_me:32419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32323: \$? = $ac_status" >&5
+  echo "$as_me:32425: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -32331,20 +32433,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:32334: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:32436: 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:32341: checking for int" >&5
+echo "$as_me:32443: 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 32347 "configure"
+#line 32449 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32359,16 +32461,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32464: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32365: \$? = $ac_status" >&5
+  echo "$as_me:32467: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32371: \$? = $ac_status" >&5
+  echo "$as_me:32473: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_int=yes
 else
@@ -32378,10 +32480,10 @@ ac_cv_type_int=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32381: result: $ac_cv_type_int" >&5
+echo "$as_me:32483: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:32384: checking size of int" >&5
+echo "$as_me:32486: 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
@@ -32390,7 +32492,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32393 "configure"
+#line 32495 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32402,21 +32504,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32408: \$? = $ac_status" >&5
+  echo "$as_me:32510: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32414: \$? = $ac_status" >&5
+  echo "$as_me:32516: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32419 "configure"
+#line 32521 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32428,16 +32530,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32434: \$? = $ac_status" >&5
+  echo "$as_me:32536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32440: \$? = $ac_status" >&5
+  echo "$as_me:32542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32453,7 +32555,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32456 "configure"
+#line 32558 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32465,16 +32567,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32471: \$? = $ac_status" >&5
+  echo "$as_me:32573: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32477: \$? = $ac_status" >&5
+  echo "$as_me:32579: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32490,7 +32592,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 32493 "configure"
+#line 32595 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32502,16 +32604,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32505: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32508: \$? = $ac_status" >&5
+  echo "$as_me:32610: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32514: \$? = $ac_status" >&5
+  echo "$as_me:32616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32524,12 +32626,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32527: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32629: 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 32532 "configure"
+#line 32634 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32545,15 +32647,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32551: \$? = $ac_status" >&5
+  echo "$as_me:32653: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32556: \$? = $ac_status" >&5
+  echo "$as_me:32658: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -32569,7 +32671,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:32572: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:32674: 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
@@ -32578,11 +32680,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:32581: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:32683: 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:32585: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:32687: 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
@@ -32596,13 +32698,13 @@ cf_cv_type=`echo "sizeof_int" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL
 	fi
 fi
 
-echo "$as_me:32599: checking for long" >&5
+echo "$as_me:32701: 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 32605 "configure"
+#line 32707 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32617,16 +32719,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32623: \$? = $ac_status" >&5
+  echo "$as_me:32725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32629: \$? = $ac_status" >&5
+  echo "$as_me:32731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_long=yes
 else
@@ -32636,10 +32738,10 @@ ac_cv_type_long=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32639: result: $ac_cv_type_long" >&5
+echo "$as_me:32741: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:32642: checking size of long" >&5
+echo "$as_me:32744: 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
@@ -32648,7 +32750,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32651 "configure"
+#line 32753 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32660,21 +32762,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32666: \$? = $ac_status" >&5
+  echo "$as_me:32768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32672: \$? = $ac_status" >&5
+  echo "$as_me:32774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32677 "configure"
+#line 32779 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32686,16 +32788,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32791: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32692: \$? = $ac_status" >&5
+  echo "$as_me:32794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32698: \$? = $ac_status" >&5
+  echo "$as_me:32800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32711,7 +32813,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32714 "configure"
+#line 32816 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32723,16 +32825,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32729: \$? = $ac_status" >&5
+  echo "$as_me:32831: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32735: \$? = $ac_status" >&5
+  echo "$as_me:32837: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32748,7 +32850,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 32751 "configure"
+#line 32853 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32760,16 +32862,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32766: \$? = $ac_status" >&5
+  echo "$as_me:32868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32772: \$? = $ac_status" >&5
+  echo "$as_me:32874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32782,12 +32884,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32785: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32887: 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 32790 "configure"
+#line 32892 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32803,15 +32905,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32809: \$? = $ac_status" >&5
+  echo "$as_me:32911: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32814: \$? = $ac_status" >&5
+  echo "$as_me:32916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -32827,7 +32929,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:32830: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:32932: 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
@@ -32836,11 +32938,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:32839: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:32941: 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:32843: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:32945: 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
@@ -32854,13 +32956,13 @@ cf_cv_type=`echo "sizeof_long" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK
 	fi
 fi
 
-echo "$as_me:32857: checking for off_t" >&5
+echo "$as_me:32959: 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 32863 "configure"
+#line 32965 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32875,16 +32977,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32881: \$? = $ac_status" >&5
+  echo "$as_me:32983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32887: \$? = $ac_status" >&5
+  echo "$as_me:32989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -32894,10 +32996,10 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32897: result: $ac_cv_type_off_t" >&5
+echo "$as_me:32999: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:32900: checking size of off_t" >&5
+echo "$as_me:33002: 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
@@ -32906,7 +33008,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32909 "configure"
+#line 33011 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32918,21 +33020,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32924: \$? = $ac_status" >&5
+  echo "$as_me:33026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32930: \$? = $ac_status" >&5
+  echo "$as_me:33032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32935 "configure"
+#line 33037 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32944,16 +33046,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32950: \$? = $ac_status" >&5
+  echo "$as_me:33052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32956: \$? = $ac_status" >&5
+  echo "$as_me:33058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32969,7 +33071,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32972 "configure"
+#line 33074 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32981,16 +33083,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32987: \$? = $ac_status" >&5
+  echo "$as_me:33089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32993: \$? = $ac_status" >&5
+  echo "$as_me:33095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33006,7 +33108,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 33009 "configure"
+#line 33111 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33018,16 +33120,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33024: \$? = $ac_status" >&5
+  echo "$as_me:33126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33030: \$? = $ac_status" >&5
+  echo "$as_me:33132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33040,12 +33142,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33043: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33145: 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 33048 "configure"
+#line 33150 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33061,15 +33163,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33067: \$? = $ac_status" >&5
+  echo "$as_me:33169: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33072: \$? = $ac_status" >&5
+  echo "$as_me:33174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -33085,7 +33187,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:33088: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:33190: 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
@@ -33094,11 +33196,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:33097: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:33199: 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:33101: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:33203: 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
@@ -33112,13 +33214,13 @@ cf_cv_type=`echo "sizeof_off_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJ
 	fi
 fi
 
-echo "$as_me:33115: checking for size_t" >&5
+echo "$as_me:33217: 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 33121 "configure"
+#line 33223 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33133,16 +33235,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33139: \$? = $ac_status" >&5
+  echo "$as_me:33241: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33145: \$? = $ac_status" >&5
+  echo "$as_me:33247: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -33152,10 +33254,10 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33155: result: $ac_cv_type_size_t" >&5
+echo "$as_me:33257: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 
-echo "$as_me:33158: checking size of size_t" >&5
+echo "$as_me:33260: 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
@@ -33164,7 +33266,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33167 "configure"
+#line 33269 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33176,21 +33278,21 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33182: \$? = $ac_status" >&5
+  echo "$as_me:33284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33188: \$? = $ac_status" >&5
+  echo "$as_me:33290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33193 "configure"
+#line 33295 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33202,16 +33304,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33208: \$? = $ac_status" >&5
+  echo "$as_me:33310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33214: \$? = $ac_status" >&5
+  echo "$as_me:33316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33227,7 +33329,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33230 "configure"
+#line 33332 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33239,16 +33341,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33344: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33245: \$? = $ac_status" >&5
+  echo "$as_me:33347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33251: \$? = $ac_status" >&5
+  echo "$as_me:33353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33264,7 +33366,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 33267 "configure"
+#line 33369 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33276,16 +33378,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33282: \$? = $ac_status" >&5
+  echo "$as_me:33384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33288: \$? = $ac_status" >&5
+  echo "$as_me:33390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33298,12 +33400,12 @@ done
 ac_cv_sizeof_size_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33301: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33403: 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 33306 "configure"
+#line 33408 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33319,15 +33421,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33325: \$? = $ac_status" >&5
+  echo "$as_me:33427: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33330: \$? = $ac_status" >&5
+  echo "$as_me:33432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
@@ -33343,7 +33445,7 @@ else
   ac_cv_sizeof_size_t=0
 fi
 fi
-echo "$as_me:33346: result: $ac_cv_sizeof_size_t" >&5
+echo "$as_me:33448: 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
@@ -33352,11 +33454,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:33355: WARNING: using 4 for sizeof size_t" >&5
+		{ echo "$as_me:33457: 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:33359: WARNING: sizeof size_t not found, using 4" >&5
+		{ echo "$as_me:33461: 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
@@ -33370,13 +33472,13 @@ cf_cv_type=`echo "sizeof_size_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33373: checking for time_t" >&5
+echo "$as_me:33475: 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 33379 "configure"
+#line 33481 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33391,16 +33493,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33397: \$? = $ac_status" >&5
+  echo "$as_me:33499: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33403: \$? = $ac_status" >&5
+  echo "$as_me:33505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -33410,10 +33512,10 @@ ac_cv_type_time_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33413: result: $ac_cv_type_time_t" >&5
+echo "$as_me:33515: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:33416: checking size of time_t" >&5
+echo "$as_me:33518: 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
@@ -33422,7 +33524,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33425 "configure"
+#line 33527 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33434,21 +33536,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33440: \$? = $ac_status" >&5
+  echo "$as_me:33542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33446: \$? = $ac_status" >&5
+  echo "$as_me:33548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33451 "configure"
+#line 33553 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33460,16 +33562,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33565: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33466: \$? = $ac_status" >&5
+  echo "$as_me:33568: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33472: \$? = $ac_status" >&5
+  echo "$as_me:33574: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33485,7 +33587,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33488 "configure"
+#line 33590 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33497,16 +33599,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33503: \$? = $ac_status" >&5
+  echo "$as_me:33605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33509: \$? = $ac_status" >&5
+  echo "$as_me:33611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33522,7 +33624,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 33525 "configure"
+#line 33627 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33534,16 +33636,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33639: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33540: \$? = $ac_status" >&5
+  echo "$as_me:33642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33546: \$? = $ac_status" >&5
+  echo "$as_me:33648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33556,12 +33658,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33559: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33661: 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 33564 "configure"
+#line 33666 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33577,15 +33679,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33583: \$? = $ac_status" >&5
+  echo "$as_me:33685: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33588: \$? = $ac_status" >&5
+  echo "$as_me:33690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -33601,7 +33703,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:33604: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:33706: 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
@@ -33610,11 +33712,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:33613: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:33715: 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:33617: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:33719: 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
@@ -33628,13 +33730,13 @@ cf_cv_type=`echo "sizeof_time_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33631: checking for intptr_t" >&5
+echo "$as_me:33733: 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 33637 "configure"
+#line 33739 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33649,16 +33751,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33655: \$? = $ac_status" >&5
+  echo "$as_me:33757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33661: \$? = $ac_status" >&5
+  echo "$as_me:33763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -33668,7 +33770,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33671: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:33773: 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
   :
@@ -33682,13 +33784,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:33685: checking for working alloca.h" >&5
+echo "$as_me:33787: 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 33691 "configure"
+#line 33793 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -33700,16 +33802,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33706: \$? = $ac_status" >&5
+  echo "$as_me:33808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33712: \$? = $ac_status" >&5
+  echo "$as_me:33814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -33719,7 +33821,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33722: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:33824: 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
 
@@ -33729,13 +33831,13 @@ EOF
 
 fi
 
-echo "$as_me:33732: checking for alloca" >&5
+echo "$as_me:33834: 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 33738 "configure"
+#line 33840 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -33767,16 +33869,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33773: \$? = $ac_status" >&5
+  echo "$as_me:33875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33779: \$? = $ac_status" >&5
+  echo "$as_me:33881: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -33786,7 +33888,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33789: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:33891: 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
@@ -33807,13 +33909,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:33810: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:33912: 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 33816 "configure"
+#line 33918 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -33831,18 +33933,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:33834: result: $ac_cv_os_cray" >&5
+echo "$as_me:33936: 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:33839: checking for $ac_func" >&5
+echo "$as_me:33941: 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 33845 "configure"
+#line 33947 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -33873,16 +33975,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33879: \$? = $ac_status" >&5
+  echo "$as_me:33981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33885: \$? = $ac_status" >&5
+  echo "$as_me:33987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -33892,7 +33994,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33895: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:33997: 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
 
@@ -33906,7 +34008,7 @@ fi
   done
 fi
 
-echo "$as_me:33909: checking stack direction for C alloca" >&5
+echo "$as_me:34011: 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
@@ -33915,7 +34017,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33918 "configure"
+#line 34020 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -33938,15 +34040,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33944: \$? = $ac_status" >&5
+  echo "$as_me:34046: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33949: \$? = $ac_status" >&5
+  echo "$as_me:34051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -33958,7 +34060,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:33961: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:34063: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -33970,23 +34072,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:33973: checking for $ac_header" >&5
+echo "$as_me:34075: 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 33979 "configure"
+#line 34081 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:33983: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:34085: \"$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:33989: \$? = $ac_status" >&5
+  echo "$as_me:34091: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34005,7 +34107,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:34008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:34110: 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
@@ -34018,13 +34120,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34021: checking for $ac_func" >&5
+echo "$as_me:34123: 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 34027 "configure"
+#line 34129 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34055,16 +34157,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34061: \$? = $ac_status" >&5
+  echo "$as_me:34163: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34067: \$? = $ac_status" >&5
+  echo "$as_me:34169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34074,7 +34176,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34077: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34179: 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
@@ -34086,7 +34188,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:34089: checking for working fork" >&5
+  echo "$as_me:34191: 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
@@ -34109,15 +34211,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34115: \$? = $ac_status" >&5
+  echo "$as_me:34217: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34120: \$? = $ac_status" >&5
+  echo "$as_me:34222: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -34129,7 +34231,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34132: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:34234: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -34143,12 +34245,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:34146: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34248: 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:34151: checking for working vfork" >&5
+  echo "$as_me:34253: 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
@@ -34157,7 +34259,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34160 "configure"
+#line 34262 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -34254,15 +34356,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34260: \$? = $ac_status" >&5
+  echo "$as_me:34362: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34265: \$? = $ac_status" >&5
+  echo "$as_me:34367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -34274,13 +34376,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34277: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:34379: 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:34283: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34385: 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
 
@@ -34305,14 +34407,14 @@ EOF
 
 fi
 
-echo "$as_me:34308: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:34410: 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 34315 "configure"
+#line 34417 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34329,16 +34431,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34335: \$? = $ac_status" >&5
+  echo "$as_me:34437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34341: \$? = $ac_status" >&5
+  echo "$as_me:34443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -34346,7 +34448,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34349 "configure"
+#line 34451 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34368,16 +34470,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34374: \$? = $ac_status" >&5
+  echo "$as_me:34476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34380: \$? = $ac_status" >&5
+  echo "$as_me:34482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -34390,21 +34492,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:34393: result: $cf_cv_fionbio" >&5
+echo "$as_me:34495: 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:34400: checking for broken/missing definition of remove" >&5
+echo "$as_me:34502: 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 34407 "configure"
+#line 34509 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34416,23 +34518,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34422: \$? = $ac_status" >&5
+  echo "$as_me:34524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34428: \$? = $ac_status" >&5
+  echo "$as_me:34530: \$? = $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 34435 "configure"
+#line 34537 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -34445,16 +34547,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34451: \$? = $ac_status" >&5
+  echo "$as_me:34553: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34457: \$? = $ac_status" >&5
+  echo "$as_me:34559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -34469,21 +34571,21 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34472: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:34574: 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:34479: checking for lstat" >&5
+echo "$as_me:34581: 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 34486 "configure"
+#line 34588 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34497,16 +34599,16 @@ struct stat sb; lstat(".", &sb); (void) sb
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34503: \$? = $ac_status" >&5
+  echo "$as_me:34605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34509: \$? = $ac_status" >&5
+  echo "$as_me:34611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -34518,7 +34620,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34521: result: $ac_cv_func_lstat " >&5
+echo "$as_me:34623: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test "$ac_cv_func_lstat" = yes; then
 
@@ -34528,13 +34630,13 @@ EOF
 
 fi
 
-echo "$as_me:34531: checking for vasprintf" >&5
+echo "$as_me:34633: 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 34537 "configure"
+#line 34639 "configure"
 #include "confdefs.h"
 #define vasprintf autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34565,16 +34667,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34571: \$? = $ac_status" >&5
+  echo "$as_me:34673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34577: \$? = $ac_status" >&5
+  echo "$as_me:34679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vasprintf=yes
 else
@@ -34584,7 +34686,7 @@ ac_cv_func_vasprintf=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34587: result: $ac_cv_func_vasprintf" >&5
+echo "$as_me:34689: result: $ac_cv_func_vasprintf" >&5
 echo "${ECHO_T}$ac_cv_func_vasprintf" >&6
 if test "$ac_cv_func_vasprintf" = yes; then
 
@@ -34592,10 +34694,10 @@ cat >>confdefs.h <<\EOF
 #define HAVE_VASPRINTF 1
 EOF
 
-	echo "$as_me:34595: checking if vasprintf requires workaround" >&5
+	echo "$as_me:34697: checking if vasprintf requires workaround" >&5
 echo $ECHO_N "checking if vasprintf requires workaround... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 34598 "configure"
+#line 34700 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -34611,19 +34713,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34617: \$? = $ac_status" >&5
+  echo "$as_me:34719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34623: \$? = $ac_status" >&5
+  echo "$as_me:34725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-		echo "$as_me:34626: result: no" >&5
+		echo "$as_me:34728: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
@@ -34631,7 +34733,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 34634 "configure"
+#line 34736 "configure"
 #include "confdefs.h"
 
 			#ifndef _GNU_SOURCE
@@ -34650,19 +34752,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34656: \$? = $ac_status" >&5
+  echo "$as_me:34758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34662: \$? = $ac_status" >&5
+  echo "$as_me:34764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-			echo "$as_me:34665: result: yes" >&5
+			echo "$as_me:34767: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
@@ -34672,7 +34774,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			echo "$as_me:34675: result: unknown" >&5
+			echo "$as_me:34777: result: unknown" >&5
 echo "${ECHO_T}unknown" >&6
 
 fi
@@ -34705,13 +34807,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34708: checking for $ac_func" >&5
+echo "$as_me:34810: 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 34714 "configure"
+#line 34816 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34742,16 +34844,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34748: \$? = $ac_status" >&5
+  echo "$as_me:34850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34754: \$? = $ac_status" >&5
+  echo "$as_me:34856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34761,7 +34863,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34764: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34866: 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
@@ -34775,13 +34877,13 @@ for ac_func in \
 	mkdtemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34778: checking for $ac_func" >&5
+echo "$as_me:34880: 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 34784 "configure"
+#line 34886 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34812,16 +34914,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34818: \$? = $ac_status" >&5
+  echo "$as_me:34920: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34824: \$? = $ac_status" >&5
+  echo "$as_me:34926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34831,7 +34933,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34834: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34936: 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
@@ -34843,13 +34945,13 @@ else
 for ac_func in mktemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34846: checking for $ac_func" >&5
+echo "$as_me:34948: 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 34852 "configure"
+#line 34954 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34880,16 +34982,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34886: \$? = $ac_status" >&5
+  echo "$as_me:34988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34892: \$? = $ac_status" >&5
+  echo "$as_me:34994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34899,7 +35001,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34902: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:35004: 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
@@ -34919,13 +35021,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34922: checking for $ac_func" >&5
+echo "$as_me:35024: 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 34928 "configure"
+#line 35030 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34956,16 +35058,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34962: \$? = $ac_status" >&5
+  echo "$as_me:35064: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34968: \$? = $ac_status" >&5
+  echo "$as_me:35070: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34975,7 +35077,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34978: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:35080: 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
@@ -34987,7 +35089,7 @@ else
 fi
 done
 
-echo "$as_me:34990: checking for random-integer functions" >&5
+echo "$as_me:35092: 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
@@ -35007,7 +35109,7 @@ do
 	esac
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35010 "configure"
+#line 35112 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35026,16 +35128,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:35029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35032: \$? = $ac_status" >&5
+  echo "$as_me:35134: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35038: \$? = $ac_status" >&5
+  echo "$as_me:35140: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -35047,10 +35149,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:35050: result: $cf_cv_srand_func" >&5
+echo "$as_me:35152: 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:35053: checking for range of random-integers" >&5
+	echo "$as_me:35155: 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
@@ -35071,7 +35173,7 @@ else
 			;;
 		esac
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 35074 "configure"
+#line 35176 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35090,16 +35192,16 @@ long x = $cf_cv_rand_max; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35096: \$? = $ac_status" >&5
+  echo "$as_me:35198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35102: \$? = $ac_status" >&5
+  echo "$as_me:35204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -35110,15 +35212,15 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35113: result: $cf_cv_rand_max" >&5
+echo "$as_me:35215: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case "$cf_cv_srand_func" in
 	(*/arc4random)
-		echo "$as_me:35118: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:35220: 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 35121 "configure"
+#line 35223 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35131,23 +35233,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35137: \$? = $ac_status" >&5
+  echo "$as_me:35239: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35143: \$? = $ac_status" >&5
+  echo "$as_me:35245: \$? = $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 35150 "configure"
+#line 35252 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35159,16 +35261,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35162: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35165: \$? = $ac_status" >&5
+  echo "$as_me:35267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35171: \$? = $ac_status" >&5
+  echo "$as_me:35273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -35179,7 +35281,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	    echo "$as_me:35182: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:35284: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -35189,10 +35291,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:35192: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:35294: 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 35195 "configure"
+#line 35297 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35205,23 +35307,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35211: \$? = $ac_status" >&5
+  echo "$as_me:35313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35217: \$? = $ac_status" >&5
+  echo "$as_me:35319: \$? = $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 35224 "configure"
+#line 35326 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35233,16 +35335,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35239: \$? = $ac_status" >&5
+  echo "$as_me:35341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35245: \$? = $ac_status" >&5
+  echo "$as_me:35347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=yes
 else
@@ -35253,7 +35355,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-			echo "$as_me:35256: result: $cf_bsd_random_h" >&5
+			echo "$as_me:35358: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -35263,7 +35365,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:35266: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:35368: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -35298,13 +35400,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:35301: checking for $ac_func declaration" >&5
+echo "$as_me:35403: 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 35307 "configure"
+#line 35409 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35325,20 +35427,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35331: \$? = $ac_status" >&5
+  echo "$as_me:35433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35337: \$? = $ac_status" >&5
+  echo "$as_me:35439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35341 "configure"
+#line 35443 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35359,16 +35461,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35464: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35365: \$? = $ac_status" >&5
+  echo "$as_me:35467: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35371: \$? = $ac_status" >&5
+  echo "$as_me:35473: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35389,11 +35491,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:35392: result: yes" >&5
+  echo "$as_me:35494: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35396: result: no" >&5
+  echo "$as_me:35498: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35408,13 +35510,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:35411: checking for $ac_func declaration" >&5
+echo "$as_me:35513: 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 35417 "configure"
+#line 35519 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35428,20 +35530,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35434: \$? = $ac_status" >&5
+  echo "$as_me:35536: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35440: \$? = $ac_status" >&5
+  echo "$as_me:35542: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35444 "configure"
+#line 35546 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35455,16 +35557,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35461: \$? = $ac_status" >&5
+  echo "$as_me:35563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35467: \$? = $ac_status" >&5
+  echo "$as_me:35569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35485,11 +35587,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:35488: result: yes" >&5
+  echo "$as_me:35590: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35492: result: no" >&5
+  echo "$as_me:35594: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35504,13 +35606,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:35507: checking for $ac_func declaration" >&5
+echo "$as_me:35609: 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 35513 "configure"
+#line 35615 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35526,20 +35628,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35631: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35532: \$? = $ac_status" >&5
+  echo "$as_me:35634: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35538: \$? = $ac_status" >&5
+  echo "$as_me:35640: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35542 "configure"
+#line 35644 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35555,16 +35657,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35660: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35561: \$? = $ac_status" >&5
+  echo "$as_me:35663: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35567: \$? = $ac_status" >&5
+  echo "$as_me:35669: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35585,11 +35687,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:35588: result: yes" >&5
+  echo "$as_me:35690: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35592: result: no" >&5
+  echo "$as_me:35694: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35601,14 +35703,14 @@ EOF
 fi
 done
 
-echo "$as_me:35604: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:35706: 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 35611 "configure"
+#line 35713 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -35622,16 +35724,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35628: \$? = $ac_status" >&5
+  echo "$as_me:35730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35634: \$? = $ac_status" >&5
+  echo "$as_me:35736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -35642,7 +35744,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:35645: result: $cf_cv_bool_defs" >&5
+echo "$as_me:35747: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -35656,14 +35758,14 @@ EOF
 
 fi
 
-echo "$as_me:35659: checking if external errno is declared" >&5
+echo "$as_me:35761: 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 35666 "configure"
+#line 35768 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35681,16 +35783,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35687: \$? = $ac_status" >&5
+  echo "$as_me:35789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35693: \$? = $ac_status" >&5
+  echo "$as_me:35795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -35701,7 +35803,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35704: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:35806: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -35716,14 +35818,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:35719: checking if external errno exists" >&5
+echo "$as_me:35821: 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 35726 "configure"
+#line 35828 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -35738,16 +35840,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35744: \$? = $ac_status" >&5
+  echo "$as_me:35846: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35750: \$? = $ac_status" >&5
+  echo "$as_me:35852: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -35758,7 +35860,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35761: result: $cf_cv_have_errno" >&5
+echo "$as_me:35863: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -35771,7 +35873,7 @@ EOF
 
 fi
 
-echo "$as_me:35774: checking if we can set errno" >&5
+echo "$as_me:35876: 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
@@ -35779,7 +35881,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35782 "configure"
+#line 35884 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -35791,16 +35893,16 @@ errno = 255
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35797: \$? = $ac_status" >&5
+  echo "$as_me:35899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35803: \$? = $ac_status" >&5
+  echo "$as_me:35905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -35811,7 +35913,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35814 "configure"
+#line 35916 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -35822,15 +35924,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:35825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35828: \$? = $ac_status" >&5
+  echo "$as_me:35930: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:35830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35833: \$? = $ac_status" >&5
+  echo "$as_me:35935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=yes
 else
@@ -35843,21 +35945,21 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:35846: result: $cf_cv_set_errno" >&5
+echo "$as_me:35948: 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:35853: checking for setlocale()" >&5
+echo "$as_me:35955: 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 35860 "configure"
+#line 35962 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -35869,16 +35971,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35875: \$? = $ac_status" >&5
+  echo "$as_me:35977: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35881: \$? = $ac_status" >&5
+  echo "$as_me:35983: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_locale=yes
 else
@@ -35890,7 +35992,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:35893: result: $cf_cv_locale" >&5
+echo "$as_me:35995: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test "$cf_cv_locale" = yes && {
 cat >>confdefs.h <<\EOF
@@ -35898,14 +36000,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:35901: checking if NGROUPS is defined" >&5
+echo "$as_me:36003: 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 35908 "configure"
+#line 36010 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35924,23 +36026,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35927: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35930: \$? = $ac_status" >&5
+  echo "$as_me:36032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35936: \$? = $ac_status" >&5
+  echo "$as_me:36038: \$? = $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 35943 "configure"
+#line 36045 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35959,16 +36061,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35965: \$? = $ac_status" >&5
+  echo "$as_me:36067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35971: \$? = $ac_status" >&5
+  echo "$as_me:36073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -35980,7 +36082,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:35983: result: $cf_cv_ngroups" >&5
+echo "$as_me:36085: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -36001,13 +36103,13 @@ fi
 for ac_func in strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36004: checking for $ac_func" >&5
+echo "$as_me:36106: 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 36010 "configure"
+#line 36112 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -36038,16 +36140,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36044: \$? = $ac_status" >&5
+  echo "$as_me:36146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36050: \$? = $ac_status" >&5
+  echo "$as_me:36152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36057,7 +36159,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:36060: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:36162: 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
@@ -36066,14 +36168,14 @@ EOF
 
 else
 
-echo "$as_me:36069: checking if external sys_nerr is declared" >&5
+echo "$as_me:36171: 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 36076 "configure"
+#line 36178 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36091,16 +36193,16 @@ int x = (int) sys_nerr; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36097: \$? = $ac_status" >&5
+  echo "$as_me:36199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36103: \$? = $ac_status" >&5
+  echo "$as_me:36205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -36111,7 +36213,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36114: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:36216: 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
@@ -36126,14 +36228,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36129: checking if external sys_nerr exists" >&5
+echo "$as_me:36231: 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 36136 "configure"
+#line 36238 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -36148,16 +36250,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36154: \$? = $ac_status" >&5
+  echo "$as_me:36256: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36160: \$? = $ac_status" >&5
+  echo "$as_me:36262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -36168,7 +36270,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36171: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:36273: 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
@@ -36181,14 +36283,14 @@ EOF
 
 fi
 
-echo "$as_me:36184: checking if external sys_errlist is declared" >&5
+echo "$as_me:36286: 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 36191 "configure"
+#line 36293 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36206,16 +36308,16 @@ int x = (int) sys_errlist; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36209: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36212: \$? = $ac_status" >&5
+  echo "$as_me:36314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36218: \$? = $ac_status" >&5
+  echo "$as_me:36320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -36226,7 +36328,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36229: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:36331: 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
@@ -36241,14 +36343,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36244: checking if external sys_errlist exists" >&5
+echo "$as_me:36346: 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 36251 "configure"
+#line 36353 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -36263,16 +36365,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36269: \$? = $ac_status" >&5
+  echo "$as_me:36371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36275: \$? = $ac_status" >&5
+  echo "$as_me:36377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -36283,7 +36385,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36286: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:36388: 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
@@ -36302,23 +36404,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:36305: checking for $ac_header" >&5
+echo "$as_me:36407: 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 36311 "configure"
+#line 36413 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36315: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:36417: \"$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:36321: \$? = $ac_status" >&5
+  echo "$as_me:36423: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36337,7 +36439,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:36340: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:36442: 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
@@ -36347,14 +36449,14 @@ EOF
 fi
 done
 
-echo "$as_me:36350: checking for lastlog path" >&5
+echo "$as_me:36452: 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 36357 "configure"
+#line 36459 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36374,16 +36476,16 @@ char *path = _PATH_LASTLOG; (void)path
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36380: \$? = $ac_status" >&5
+  echo "$as_me:36482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36386: \$? = $ac_status" >&5
+  echo "$as_me:36488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -36398,14 +36500,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36401: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:36503: 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:36408: checking for utmp implementation" >&5
+echo "$as_me:36510: 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
@@ -36422,7 +36524,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36425 "configure"
+#line 36527 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36438,16 +36540,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36444: \$? = $ac_status" >&5
+  echo "$as_me:36546: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36450: \$? = $ac_status" >&5
+  echo "$as_me:36552: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36456,7 +36558,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36459 "configure"
+#line 36561 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36472,16 +36574,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36577: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36478: \$? = $ac_status" >&5
+  echo "$as_me:36580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36484: \$? = $ac_status" >&5
+  echo "$as_me:36586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36496,7 +36598,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36499: result: $cf_cv_have_utmp" >&5
+echo "$as_me:36601: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -36511,14 +36613,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36514: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:36616: 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 36521 "configure"
+#line 36623 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36535,16 +36637,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36541: \$? = $ac_status" >&5
+  echo "$as_me:36643: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36547: \$? = $ac_status" >&5
+  echo "$as_me:36649: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -36556,7 +36658,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36559: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:36661: 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
@@ -36566,14 +36668,14 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36569: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:36671: 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 36576 "configure"
+#line 36678 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36590,16 +36692,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36596: \$? = $ac_status" >&5
+  echo "$as_me:36698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36602: \$? = $ac_status" >&5
+  echo "$as_me:36704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -36611,7 +36713,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36614: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:36716: 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
@@ -36621,7 +36723,7 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36624: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:36726: 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
@@ -36638,7 +36740,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36641 "configure"
+#line 36743 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36654,16 +36756,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36660: \$? = $ac_status" >&5
+  echo "$as_me:36762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36666: \$? = $ac_status" >&5
+  echo "$as_me:36768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -36675,12 +36777,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36678: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:36780: 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:36683: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:36785: 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; }; }
 	;;
@@ -36695,7 +36797,7 @@ esac
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36698: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:36800: 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
@@ -36708,7 +36810,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36711 "configure"
+#line 36813 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36725,16 +36827,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36728: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36830: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36731: \$? = $ac_status" >&5
+  echo "$as_me:36833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36737: \$? = $ac_status" >&5
+  echo "$as_me:36839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -36747,7 +36849,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36750: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:36852: 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
 
@@ -36763,14 +36865,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36766: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:36868: 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 36773 "configure"
+#line 36875 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36787,23 +36889,23 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36793: \$? = $ac_status" >&5
+  echo "$as_me:36895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36799: \$? = $ac_status" >&5
+  echo "$as_me:36901: \$? = $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 36806 "configure"
+#line 36908 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36820,16 +36922,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36826: \$? = $ac_status" >&5
+  echo "$as_me:36928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36832: \$? = $ac_status" >&5
+  echo "$as_me:36934: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -36843,7 +36945,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36846: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:36948: 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
 
@@ -36862,14 +36964,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36865: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:36967: 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 36872 "configure"
+#line 36974 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36886,16 +36988,16 @@ static struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36892: \$? = $ac_status" >&5
+  echo "$as_me:36994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36898: \$? = $ac_status" >&5
+  echo "$as_me:37000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -36906,7 +37008,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36909: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:37011: 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
 
@@ -36917,7 +37019,7 @@ EOF
 fi
 fi
 
-echo "$as_me:36920: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:37022: 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
@@ -36925,7 +37027,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36928 "configure"
+#line 37030 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36944,16 +37046,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36947: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36950: \$? = $ac_status" >&5
+  echo "$as_me:37052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36956: \$? = $ac_status" >&5
+  echo "$as_me:37058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -36964,7 +37066,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36967: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:37069: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -36973,14 +37075,14 @@ EOF
 
 fi
 
-echo "$as_me:36976: checking if external h_errno exists" >&5
+echo "$as_me:37078: 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 36983 "configure"
+#line 37085 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -36995,16 +37097,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37001: \$? = $ac_status" >&5
+  echo "$as_me:37103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37007: \$? = $ac_status" >&5
+  echo "$as_me:37109: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -37015,7 +37117,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37018: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:37120: 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
@@ -37028,7 +37130,7 @@ EOF
 
 fi
 
-echo "$as_me:37031: checking if bibp: URLs should be supported" >&5
+echo "$as_me:37133: 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.
@@ -37045,14 +37147,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:37048: result: $use_bibp_urls" >&5
+echo "$as_me:37150: 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:37055: checking if configuration info should be browsable" >&5
+echo "$as_me:37157: 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.
@@ -37069,14 +37171,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:37072: result: $use_config_info" >&5
+echo "$as_me:37174: 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:37079: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:37181: 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.
@@ -37093,14 +37195,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:37096: result: $use_forms_options" >&5
+echo "$as_me:37198: 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:37103: checking if old-style options menu should be used" >&5
+echo "$as_me:37205: 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.
@@ -37117,14 +37219,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:37120: result: $use_menu_options" >&5
+echo "$as_me:37222: 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:37127: checking if sessions code should be used" >&5
+echo "$as_me:37229: 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.
@@ -37141,7 +37243,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:37144: result: $use_sessions" >&5
+echo "$as_me:37246: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test "$use_sessions" != no ; then
 
@@ -37152,7 +37254,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:37155: checking if session-caching code should be used" >&5
+echo "$as_me:37257: 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.
@@ -37169,7 +37271,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:37172: result: $use_session_cache" >&5
+echo "$as_me:37274: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test "$use_session_cache" != no ; then
 
@@ -37179,7 +37281,7 @@ EOF
 
 fi
 
-echo "$as_me:37182: checking if address-list page should be used" >&5
+echo "$as_me:37284: 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.
@@ -37196,14 +37298,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:37199: result: $use_addrlist_page" >&5
+echo "$as_me:37301: 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:37206: checking if support for CJK should be used" >&5
+echo "$as_me:37308: 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.
@@ -37220,7 +37322,7 @@ else
 	use_cjk=yes
 
 fi;
-echo "$as_me:37223: result: $use_cjk" >&5
+echo "$as_me:37325: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test "$use_cjk" != no &&
 cat >>confdefs.h <<\EOF
@@ -37270,7 +37372,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37273 "configure"
+#line 37375 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37282,16 +37384,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37285: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37288: \$? = $ac_status" >&5
+  echo "$as_me:37390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37294: \$? = $ac_status" >&5
+  echo "$as_me:37396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37308,7 +37410,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}:37311: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37413: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37354,7 +37456,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37357 "configure"
+#line 37459 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37366,16 +37468,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37372: \$? = $ac_status" >&5
+  echo "$as_me:37474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37378: \$? = $ac_status" >&5
+  echo "$as_me:37480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37392,7 +37494,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}:37395: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37497: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37410,7 +37512,7 @@ echo "${as_me:-configure}:37395: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:37413: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37515: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37435,7 +37537,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}:37438: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37540: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37464,7 +37566,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}:37467: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37569: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37473,7 +37575,7 @@ echo "${as_me:-configure}:37467: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:37476: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37578: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37484,7 +37586,7 @@ esac
 
 fi;
 
-  echo "$as_me:37487: checking for iconv" >&5
+  echo "$as_me:37589: 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
@@ -37495,12 +37597,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:37498: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37600: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37503 "configure"
+#line 37605 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37519,16 +37621,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37525: \$? = $ac_status" >&5
+  echo "$as_me:37627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37531: \$? = $ac_status" >&5
+  echo "$as_me:37633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37542,7 +37644,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37545 "configure"
+#line 37647 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37561,16 +37663,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37567: \$? = $ac_status" >&5
+  echo "$as_me:37669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37573: \$? = $ac_status" >&5
+  echo "$as_me:37675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37587,9 +37689,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:37590: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:37692: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:37592: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37694: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37680,7 +37782,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}:37683: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37785: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -37688,7 +37790,7 @@ echo "${as_me:-configure}:37683: testing ... testing $cf_cv_header_path_iconv ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 37691 "configure"
+#line 37793 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37707,21 +37809,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37713: \$? = $ac_status" >&5
+  echo "$as_me:37815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37719: \$? = $ac_status" >&5
+  echo "$as_me:37821: \$? = $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}:37724: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37826: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37739,7 +37841,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:37742: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37844: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -37814,13 +37916,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}:37817: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37919: 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 37823 "configure"
+#line 37925 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37839,21 +37941,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37845: \$? = $ac_status" >&5
+  echo "$as_me:37947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37851: \$? = $ac_status" >&5
+  echo "$as_me:37953: \$? = $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}:37856: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37958: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -37893,7 +37995,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:37896: result: $am_cv_func_iconv" >&5
+echo "$as_me:37998: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -37902,14 +38004,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:37905: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:38007: 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 37912 "configure"
+#line 38014 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37934,16 +38036,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37940: \$? = $ac_status" >&5
+  echo "$as_me:38042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37946: \$? = $ac_status" >&5
+  echo "$as_me:38048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -37953,7 +38055,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:37956: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:38058: 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
@@ -37998,7 +38100,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38001 "configure"
+#line 38103 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38010,16 +38112,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38016: \$? = $ac_status" >&5
+  echo "$as_me:38118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38022: \$? = $ac_status" >&5
+  echo "$as_me:38124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38036,7 +38138,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}:38039: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38141: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38075,7 +38177,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}:38078: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38180: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38089,7 +38191,7 @@ fi
 if test "x$am_cv_func_iconv" = "xyes"
 then
 
-echo "$as_me:38092: checking if experimental support for Chinese UTF-8 should be used" >&5
+echo "$as_me:38194: 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.
@@ -38106,7 +38208,7 @@ else
 	use_cn_utf8=yes
 
 fi;
-echo "$as_me:38109: result: $use_cn_utf8" >&5
+echo "$as_me:38211: result: $use_cn_utf8" >&5
 echo "${ECHO_T}$use_cn_utf8" >&6
 if test "$use_cn_utf8" != no ; then
 
@@ -38117,7 +38219,7 @@ EOF
 	use_cjk_utf8=yes
 fi
 
-echo "$as_me:38120: checking if support for Japanese UTF-8 should be used" >&5
+echo "$as_me:38222: 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.
@@ -38134,7 +38236,7 @@ else
 	use_ja_utf8=yes
 
 fi;
-echo "$as_me:38137: result: $use_ja_utf8" >&5
+echo "$as_me:38239: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test "$use_ja_utf8" != no ; then
 
@@ -38155,11 +38257,11 @@ fi
 else
 	test -n "$verbose" && echo "	skipping CJK features which depend on iconv" 1>&6
 
-echo "${as_me:-configure}:38158: testing skipping CJK features which depend on iconv ..." 1>&5
+echo "${as_me:-configure}:38260: testing skipping CJK features which depend on iconv ..." 1>&5
 
 fi
 
-echo "$as_me:38162: checking if experimental wcwidth/UTF-8 logic should be used" >&5
+echo "$as_me:38264: 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.
@@ -38176,7 +38278,7 @@ else
 	use_wcwidth=no
 
 fi;
-echo "$as_me:38179: result: $use_wcwidth" >&5
+echo "$as_me:38281: result: $use_wcwidth" >&5
 echo "${ECHO_T}$use_wcwidth" >&6
 test "$use_wcwidth" != no &&
 cat >>confdefs.h <<\EOF
@@ -38191,7 +38293,7 @@ case "$cf_cv_screen" in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:38194: checking if you want to use default-colors" >&5
+echo "$as_me:38296: 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.
@@ -38208,7 +38310,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:38211: result: $use_dft_colors" >&5
+echo "$as_me:38313: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test "$use_dft_colors" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -38217,7 +38319,7 @@ EOF
 
 fi
 
-echo "$as_me:38220: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:38322: 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.
@@ -38234,14 +38336,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:38237: result: $use_kbd_layout" >&5
+echo "$as_me:38339: 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:38244: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:38346: 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.
@@ -38258,14 +38360,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:38261: result: $use_nested_tables" >&5
+echo "$as_me:38363: 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:38268: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:38370: 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.
@@ -38282,14 +38384,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:38285: result: $use_alt_bindings" >&5
+echo "$as_me:38387: 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:38292: checking if ascii case-conversion should be used" >&5
+echo "$as_me:38394: 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.
@@ -38306,14 +38408,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:38309: result: $use_ascii_ctypes" >&5
+echo "$as_me:38411: 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:38316: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:38418: 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.
@@ -38330,14 +38432,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:38333: result: $use_ext_htmldtd" >&5
+echo "$as_me:38435: 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:38340: checking if file-upload logic should be used" >&5
+echo "$as_me:38442: 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.
@@ -38354,14 +38456,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:38357: result: $use_file_upload" >&5
+echo "$as_me:38459: 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:38364: checking if IDNA support should be used" >&5
+echo "$as_me:38466: 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.
@@ -38378,7 +38480,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:38381: result: $use_idna" >&5
+echo "$as_me:38483: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -38420,7 +38522,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38423 "configure"
+#line 38525 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38432,16 +38534,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38438: \$? = $ac_status" >&5
+  echo "$as_me:38540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38444: \$? = $ac_status" >&5
+  echo "$as_me:38546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38458,7 +38560,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}:38461: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38563: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38504,7 +38606,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38507 "configure"
+#line 38609 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38516,16 +38618,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38522: \$? = $ac_status" >&5
+  echo "$as_me:38624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38528: \$? = $ac_status" >&5
+  echo "$as_me:38630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38542,7 +38644,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}:38545: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38647: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38560,7 +38662,7 @@ echo "${as_me:-configure}:38545: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:38563: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38665: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38585,7 +38687,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}:38588: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38690: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38614,7 +38716,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}:38617: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38719: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38623,7 +38725,7 @@ echo "${as_me:-configure}:38617: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:38626: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38728: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38637,12 +38739,12 @@ esac
 cf_cv_header_path_idn2=
 cf_cv_library_path_idn2=
 
-echo "${as_me:-configure}:38640: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38742: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38645 "configure"
+#line 38747 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38661,16 +38763,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38667: \$? = $ac_status" >&5
+  echo "$as_me:38769: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38673: \$? = $ac_status" >&5
+  echo "$as_me:38775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38684,7 +38786,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38687 "configure"
+#line 38789 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38703,16 +38805,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38709: \$? = $ac_status" >&5
+  echo "$as_me:38811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38715: \$? = $ac_status" >&5
+  echo "$as_me:38817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38729,9 +38831,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn2 library" 1>&6
 
-echo "${as_me:-configure}:38732: testing find linkage for idn2 library ..." 1>&5
+echo "${as_me:-configure}:38834: testing find linkage for idn2 library ..." 1>&5
 
-echo "${as_me:-configure}:38734: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38836: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38822,7 +38924,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}:38825: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38927: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -38830,7 +38932,7 @@ echo "${as_me:-configure}:38825: testing ... testing $cf_cv_header_path_idn2 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 38833 "configure"
+#line 38935 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38849,21 +38951,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38855: \$? = $ac_status" >&5
+  echo "$as_me:38957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38861: \$? = $ac_status" >&5
+  echo "$as_me:38963: \$? = $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}:38866: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38968: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
 
 				cf_cv_find_linkage_idn2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38881,7 +38983,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn2" = maybe ; then
 
-echo "${as_me:-configure}:38884: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38986: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -38956,13 +39058,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}:38959: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39061: 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 38965 "configure"
+#line 39067 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38981,21 +39083,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39086: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38987: \$? = $ac_status" >&5
+  echo "$as_me:39089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38993: \$? = $ac_status" >&5
+  echo "$as_me:39095: \$? = $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}:38998: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39100: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
 
 					cf_cv_find_linkage_idn2=yes
 					cf_cv_library_file_idn2="-lidn2"
@@ -39057,7 +39159,7 @@ if test -n "$cf_cv_header_path_idn2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39060 "configure"
+#line 39162 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39069,16 +39171,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39075: \$? = $ac_status" >&5
+  echo "$as_me:39177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39081: \$? = $ac_status" >&5
+  echo "$as_me:39183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39095,7 +39197,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}:39098: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39200: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39131,7 +39233,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}:39134: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39236: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39158,14 +39260,14 @@ LIBS="$cf_add_libs"
 else
 test -n "$verbose" && echo "	unsuccessful, will try idn (older)" 1>&6
 
-echo "${as_me:-configure}:39161: testing unsuccessful, will try idn (older) ..." 1>&5
+echo "${as_me:-configure}:39263: 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}:39168: testing found idn2 library ..." 1>&5
+echo "${as_me:-configure}:39270: testing found idn2 library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDN2 1
@@ -39178,12 +39280,12 @@ else
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:39181: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39283: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39186 "configure"
+#line 39288 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39202,16 +39304,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39208: \$? = $ac_status" >&5
+  echo "$as_me:39310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39214: \$? = $ac_status" >&5
+  echo "$as_me:39316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39225,7 +39327,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39228 "configure"
+#line 39330 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39244,16 +39346,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39250: \$? = $ac_status" >&5
+  echo "$as_me:39352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39256: \$? = $ac_status" >&5
+  echo "$as_me:39358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39270,9 +39372,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:39273: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:39375: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:39275: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39377: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39363,7 +39465,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}:39366: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39468: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -39371,7 +39473,7 @@ echo "${as_me:-configure}:39366: testing ... testing $cf_cv_header_path_idn ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 39374 "configure"
+#line 39476 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39390,21 +39492,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39495: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39396: \$? = $ac_status" >&5
+  echo "$as_me:39498: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39402: \$? = $ac_status" >&5
+  echo "$as_me:39504: \$? = $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}:39407: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39509: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39422,7 +39524,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:39425: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39527: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39497,13 +39599,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}:39500: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39602: 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 39506 "configure"
+#line 39608 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39522,21 +39624,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39528: \$? = $ac_status" >&5
+  echo "$as_me:39630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39534: \$? = $ac_status" >&5
+  echo "$as_me:39636: \$? = $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}:39539: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39641: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -39598,7 +39700,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39601 "configure"
+#line 39703 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39610,16 +39712,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39616: \$? = $ac_status" >&5
+  echo "$as_me:39718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39622: \$? = $ac_status" >&5
+  echo "$as_me:39724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39636,7 +39738,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}:39639: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39741: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39672,7 +39774,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}:39675: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39777: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39697,14 +39799,14 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:39700: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:39802: 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}:39707: testing found idn library ..." 1>&5
+echo "${as_me:-configure}:39809: testing found idn library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDNA 1
@@ -39715,7 +39817,7 @@ fi
 
 fi
 
-echo "$as_me:39718: checking if element-justification logic should be used" >&5
+echo "$as_me:39820: 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.
@@ -39732,14 +39834,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:39735: result: $use_justify_elts" >&5
+echo "$as_me:39837: 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:39742: checking if partial-display should be used" >&5
+echo "$as_me:39844: 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.
@@ -39756,14 +39858,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:39759: result: $use_partial_display" >&5
+echo "$as_me:39861: 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:39766: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:39868: 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.
@@ -39780,14 +39882,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:39783: result: $use_filed_cookies" >&5
+echo "$as_me:39885: 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:39790: checking if html source should be colorized" >&5
+echo "$as_me:39892: 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.
@@ -39804,14 +39906,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:39807: result: $use_prettysrc" >&5
+echo "$as_me:39909: 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:39814: checking if progress-bar code should be used" >&5
+echo "$as_me:39916: 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.
@@ -39828,14 +39930,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:39831: result: $use_progressbar" >&5
+echo "$as_me:39933: 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:39838: checking if read-progress message should show ETA" >&5
+echo "$as_me:39940: 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.
@@ -39852,14 +39954,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:39855: result: $use_read_eta" >&5
+echo "$as_me:39957: 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:39862: checking if source caching should be used" >&5
+echo "$as_me:39964: 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.
@@ -39876,14 +39978,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:39879: result: $use_source_cache" >&5
+echo "$as_me:39981: 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:39886: checking if scrollbar code should be used" >&5
+echo "$as_me:39988: 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.
@@ -39900,10 +40002,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:39903: result: $use_scrollbar" >&5
+echo "$as_me:40005: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:39906: checking if charset-selection logic should be used" >&5
+echo "$as_me:40008: 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.
@@ -39920,14 +40022,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:39923: result: $use_charset_choice" >&5
+echo "$as_me:40025: 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:39930: checking if you want to use external commands" >&5
+echo "$as_me:40032: 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.
@@ -39944,7 +40046,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:39947: result: $use_externs" >&5
+echo "$as_me:40049: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test "$use_externs" != "no" ; then
 
@@ -39955,7 +40057,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:39958: checking if you want to use setfont support" >&5
+echo "$as_me:40060: 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.
@@ -39972,7 +40074,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:39975: result: $use_setfont" >&5
+echo "$as_me:40077: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test "$use_setfont" = yes ; then
 	case "$host_os" in
@@ -39983,7 +40085,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:39986: checking for $ac_word" >&5
+echo "$as_me:40088: 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
@@ -40000,7 +40102,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:40003: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40105: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -40011,10 +40113,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:40014: result: $SETFONT" >&5
+  echo "$as_me:40116: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:40017: result: no" >&5
+  echo "$as_me:40119: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40073,7 +40175,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:40076: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40178: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -40091,19 +40193,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:40094: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:40196: 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}:40101: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:40203: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:40106: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:40208: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -40114,7 +40216,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:40117: checking if you want cgi-link support" >&5
+echo "$as_me:40219: 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.
@@ -40131,10 +40233,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:40134: result: $enableval" >&5
+echo "$as_me:40236: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:40137: checking if you want change-exec support" >&5
+echo "$as_me:40239: 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.
@@ -40151,14 +40253,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:40154: result: $use_change_exec" >&5
+echo "$as_me:40256: 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:40161: checking if you want exec-links support" >&5
+echo "$as_me:40263: 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.
@@ -40175,14 +40277,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:40178: result: $use_exec_links" >&5
+echo "$as_me:40280: 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:40185: checking if you want exec-scripts support" >&5
+echo "$as_me:40287: 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.
@@ -40199,14 +40301,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:40202: result: $use_exec_scripts" >&5
+echo "$as_me:40304: 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:40209: checking if you want internal-links feature" >&5
+echo "$as_me:40311: 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.
@@ -40223,14 +40325,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:40226: result: $use_internal_links" >&5
+echo "$as_me:40328: 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:40233: checking if you want to fork NSL requests" >&5
+echo "$as_me:40335: 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.
@@ -40247,7 +40349,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:40250: result: $use_nsl_fork" >&5
+echo "$as_me:40352: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test "$use_nsl_fork" = yes ; then
 	case "$host_os" in
@@ -40268,7 +40370,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:40271: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:40373: 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.
@@ -40285,14 +40387,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:40288: result: $use_syslog" >&5
+echo "$as_me:40390: 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:40295: checking if you want to underline links" >&5
+echo "$as_me:40397: 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.
@@ -40309,7 +40411,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:40312: result: $use_underline" >&5
+echo "$as_me:40414: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test "$use_underline" = yes &&
 cat >>confdefs.h <<\EOF
@@ -40321,7 +40423,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:40324: checking if help files should be gzip'ed" >&5
+echo "$as_me:40426: 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.
@@ -40338,10 +40440,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:40341: result: $use_gzip_help" >&5
+echo "$as_me:40443: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:40344: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:40446: 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.
@@ -40351,7 +40453,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:40354: result: $use_bzlib" >&5
+echo "$as_me:40456: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -40393,7 +40495,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40396 "configure"
+#line 40498 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40405,16 +40507,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40411: \$? = $ac_status" >&5
+  echo "$as_me:40513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40417: \$? = $ac_status" >&5
+  echo "$as_me:40519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40431,7 +40533,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}:40434: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40536: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40477,7 +40579,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40480 "configure"
+#line 40582 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40489,16 +40591,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40492: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40594: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40495: \$? = $ac_status" >&5
+  echo "$as_me:40597: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40501: \$? = $ac_status" >&5
+  echo "$as_me:40603: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40515,7 +40617,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}:40518: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40620: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40533,7 +40635,7 @@ echo "${as_me:-configure}:40518: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:40536: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40638: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40558,7 +40660,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}:40561: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40663: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40587,7 +40689,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}:40590: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40692: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40596,7 +40698,7 @@ echo "${as_me:-configure}:40590: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:40599: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40701: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40610,12 +40712,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:40613: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40715: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40618 "configure"
+#line 40720 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40632,16 +40734,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40638: \$? = $ac_status" >&5
+  echo "$as_me:40740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40644: \$? = $ac_status" >&5
+  echo "$as_me:40746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40655,7 +40757,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40658 "configure"
+#line 40760 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40672,16 +40774,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40678: \$? = $ac_status" >&5
+  echo "$as_me:40780: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40684: \$? = $ac_status" >&5
+  echo "$as_me:40786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40698,9 +40800,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:40701: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:40803: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:40703: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40805: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40791,7 +40893,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}:40794: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40896: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -40799,7 +40901,7 @@ echo "${as_me:-configure}:40794: testing ... testing $cf_cv_header_path_bz2 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 40802 "configure"
+#line 40904 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40816,21 +40918,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40822: \$? = $ac_status" >&5
+  echo "$as_me:40924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40828: \$? = $ac_status" >&5
+  echo "$as_me:40930: \$? = $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}:40833: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40935: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40848,7 +40950,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:40851: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40953: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -40856,7 +40958,7 @@ echo "${as_me:-configure}:40851: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 40859 "configure"
+#line 40961 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40873,21 +40975,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40879: \$? = $ac_status" >&5
+  echo "$as_me:40981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40885: \$? = $ac_status" >&5
+  echo "$as_me:40987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:40890: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:40992: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -40968,13 +41070,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}:40971: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41073: 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 40977 "configure"
+#line 41079 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40991,21 +41093,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40997: \$? = $ac_status" >&5
+  echo "$as_me:41099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41003: \$? = $ac_status" >&5
+  echo "$as_me:41105: \$? = $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}:41008: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41110: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -41067,7 +41169,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41070 "configure"
+#line 41172 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41079,16 +41181,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41184: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41085: \$? = $ac_status" >&5
+  echo "$as_me:41187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41091: \$? = $ac_status" >&5
+  echo "$as_me:41193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41105,7 +41207,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}:41108: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41210: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41141,7 +41243,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}:41144: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41246: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41166,7 +41268,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:41169: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:41271: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -41177,7 +41279,7 @@ EOF
 
 fi
 
-echo "$as_me:41180: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:41282: 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.
@@ -41187,7 +41289,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:41190: result: $use_zlib" >&5
+echo "$as_me:41292: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -41229,7 +41331,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41232 "configure"
+#line 41334 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41241,16 +41343,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41244: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41247: \$? = $ac_status" >&5
+  echo "$as_me:41349: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41253: \$? = $ac_status" >&5
+  echo "$as_me:41355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41267,7 +41369,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}:41270: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41372: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41313,7 +41415,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41316 "configure"
+#line 41418 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41325,16 +41427,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41331: \$? = $ac_status" >&5
+  echo "$as_me:41433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41337: \$? = $ac_status" >&5
+  echo "$as_me:41439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41351,7 +41453,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}:41354: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41456: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41369,7 +41471,7 @@ echo "${as_me:-configure}:41354: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:41372: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41474: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41394,7 +41496,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}:41397: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41499: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41423,7 +41525,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}:41426: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41528: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41432,7 +41534,7 @@ echo "${as_me:-configure}:41426: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:41435: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41537: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41446,12 +41548,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:41449: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41551: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41454 "configure"
+#line 41556 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41467,16 +41569,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41473: \$? = $ac_status" >&5
+  echo "$as_me:41575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41479: \$? = $ac_status" >&5
+  echo "$as_me:41581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41490,7 +41592,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41493 "configure"
+#line 41595 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41506,16 +41608,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41512: \$? = $ac_status" >&5
+  echo "$as_me:41614: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41518: \$? = $ac_status" >&5
+  echo "$as_me:41620: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41532,9 +41634,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:41535: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:41637: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:41537: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41639: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41625,7 +41727,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}:41628: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41730: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -41633,7 +41735,7 @@ echo "${as_me:-configure}:41628: testing ... testing $cf_cv_header_path_z ..." 1
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 41636 "configure"
+#line 41738 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41649,21 +41751,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41655: \$? = $ac_status" >&5
+  echo "$as_me:41757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41661: \$? = $ac_status" >&5
+  echo "$as_me:41763: \$? = $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}:41666: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41768: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41681,7 +41783,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:41684: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41786: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -41689,7 +41791,7 @@ echo "${as_me:-configure}:41684: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 41692 "configure"
+#line 41794 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41705,21 +41807,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41711: \$? = $ac_status" >&5
+  echo "$as_me:41813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41717: \$? = $ac_status" >&5
+  echo "$as_me:41819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:41722: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:41824: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -41800,13 +41902,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}:41803: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41905: 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 41809 "configure"
+#line 41911 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41822,21 +41924,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41828: \$? = $ac_status" >&5
+  echo "$as_me:41930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41834: \$? = $ac_status" >&5
+  echo "$as_me:41936: \$? = $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}:41839: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41941: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -41898,7 +42000,7 @@ if test -n "$cf_cv_header_path_z" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41901 "configure"
+#line 42003 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41910,16 +42012,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41916: \$? = $ac_status" >&5
+  echo "$as_me:42018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41922: \$? = $ac_status" >&5
+  echo "$as_me:42024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41936,7 +42038,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}:41939: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42041: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41972,7 +42074,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}:41975: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42077: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41997,7 +42099,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:42000: WARNING: Cannot find z library" >&5
+{ echo "$as_me:42102: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -42006,13 +42108,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:42009: checking for $ac_func" >&5
+echo "$as_me:42111: 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 42015 "configure"
+#line 42117 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -42043,16 +42145,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42049: \$? = $ac_status" >&5
+  echo "$as_me:42151: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42055: \$? = $ac_status" >&5
+  echo "$as_me:42157: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -42062,7 +42164,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42065: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:42167: 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
@@ -42079,7 +42181,7 @@ EOF
 
 fi
 
-echo "$as_me:42082: checking if you want to use brotli decompression" >&5
+echo "$as_me:42184: 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.
@@ -42089,7 +42191,7 @@ if test "${with_brotli+set}" = set; then
 else
   use_brotli=no
 fi;
-echo "$as_me:42092: result: $use_brotli" >&5
+echo "$as_me:42194: result: $use_brotli" >&5
 echo "${ECHO_T}$use_brotli" >&6
 
 if test ".$use_brotli" != ".no" ; then
@@ -42131,7 +42233,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42134 "configure"
+#line 42236 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42143,16 +42245,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42149: \$? = $ac_status" >&5
+  echo "$as_me:42251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42155: \$? = $ac_status" >&5
+  echo "$as_me:42257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42169,7 +42271,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}:42172: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42274: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42215,7 +42317,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42218 "configure"
+#line 42320 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42227,16 +42329,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42233: \$? = $ac_status" >&5
+  echo "$as_me:42335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42239: \$? = $ac_status" >&5
+  echo "$as_me:42341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42253,7 +42355,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}:42256: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42358: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42271,7 +42373,7 @@ echo "${as_me:-configure}:42256: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:42274: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42376: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42296,7 +42398,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}:42299: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42401: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42325,7 +42427,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}:42328: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42430: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42334,7 +42436,7 @@ echo "${as_me:-configure}:42328: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:42337: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42439: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42348,12 +42450,12 @@ esac
 cf_cv_header_path_brotlidec=
 cf_cv_library_path_brotlidec=
 
-echo "${as_me:-configure}:42351: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42453: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42356 "configure"
+#line 42458 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42376,16 +42478,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42382: \$? = $ac_status" >&5
+  echo "$as_me:42484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42388: \$? = $ac_status" >&5
+  echo "$as_me:42490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42399,7 +42501,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbrotlidec  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42402 "configure"
+#line 42504 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42422,16 +42524,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42428: \$? = $ac_status" >&5
+  echo "$as_me:42530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42434: \$? = $ac_status" >&5
+  echo "$as_me:42536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42448,9 +42550,9 @@ cat "conftest.$ac_ext" >&5
 
 	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}:42553: testing find linkage for brotlidec library ..." 1>&5
 
-echo "${as_me:-configure}:42453: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42555: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42541,7 +42643,7 @@ cf_search="$cf_search $cf_header_path_list"
 		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
+echo "${as_me:-configure}:42646: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -42549,7 +42651,7 @@ echo "${as_me:-configure}:42544: testing ... testing $cf_cv_header_path_brotlide
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_brotlidec"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 42552 "configure"
+#line 42654 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42572,21 +42674,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42578: \$? = $ac_status" >&5
+  echo "$as_me:42680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42584: \$? = $ac_status" >&5
+  echo "$as_me:42686: \$? = $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
+echo "${as_me:-configure}:42691: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
 
 				cf_cv_find_linkage_brotlidec=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42604,7 +42706,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	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
+echo "${as_me:-configure}:42709: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -42612,7 +42714,7 @@ echo "${as_me:-configure}:42607: testing Searching for brotlidec library in FIND
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbrotlidec  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 42615 "configure"
+#line 42717 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42635,21 +42737,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42641: \$? = $ac_status" >&5
+  echo "$as_me:42743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42647: \$? = $ac_status" >&5
+  echo "$as_me:42749: \$? = $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
+echo "${as_me:-configure}:42754: testing ... found brotlidec library in system ..." 1>&5
 
 			cf_cv_find_linkage_brotlidec=yes
 else
@@ -42730,13 +42832,13 @@ cf_search="$cf_library_path_list $cf_search"
 				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
+echo "${as_me:-configure}:42835: 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"
+#line 42841 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42759,21 +42861,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42765: \$? = $ac_status" >&5
+  echo "$as_me:42867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42771: \$? = $ac_status" >&5
+  echo "$as_me:42873: \$? = $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
+echo "${as_me:-configure}:42878: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
 
 					cf_cv_find_linkage_brotlidec=yes
 					cf_cv_library_file_brotlidec="-lbrotlidec"
@@ -42835,7 +42937,7 @@ if test -n "$cf_cv_header_path_brotlidec" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42838 "configure"
+#line 42940 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42847,16 +42949,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42853: \$? = $ac_status" >&5
+  echo "$as_me:42955: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42859: \$? = $ac_status" >&5
+  echo "$as_me:42961: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42873,7 +42975,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}:42876: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42978: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42909,7 +43011,7 @@ if test -n "$cf_cv_library_path_brotlidec" ; 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}:42912: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:43014: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42934,7 +43036,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:42937: WARNING: Cannot find brotlidec library" >&5
+{ echo "$as_me:43039: WARNING: Cannot find brotlidec library" >&5
 echo "$as_me: WARNING: Cannot find brotlidec library" >&2;}
 fi
 
@@ -42945,7 +43047,7 @@ EOF
 
 fi
 
-echo "$as_me:42948: checking if you want to exclude FINGER code" >&5
+echo "$as_me:43050: 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.
@@ -42962,14 +43064,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:42965: result: $use_finger" >&5
+echo "$as_me:43067: 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:42972: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:43074: 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.
@@ -42986,14 +43088,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:42989: result: $use_gopher" >&5
+echo "$as_me:43091: 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:42996: checking if you want to exclude NEWS code" >&5
+echo "$as_me:43098: 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.
@@ -43010,14 +43112,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:43013: result: $use_news" >&5
+echo "$as_me:43115: 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:43020: checking if you want to exclude FTP code" >&5
+echo "$as_me:43122: 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.
@@ -43034,14 +43136,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:43037: result: $use_ftp" >&5
+echo "$as_me:43139: 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:43044: checking if you want to include WAIS code" >&5
+echo "$as_me:43146: 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.
@@ -43058,13 +43160,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:43061: result: $use_wais" >&5
+echo "$as_me:43163: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test "$use_wais" != "no"
 then
-	echo "$as_me:43067: checking for fs_free in -lwais" >&5
+	echo "$as_me:43169: 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
@@ -43072,7 +43174,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 43075 "configure"
+#line 43177 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -43091,16 +43193,16 @@ fs_free ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43097: \$? = $ac_status" >&5
+  echo "$as_me:43199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43103: \$? = $ac_status" >&5
+  echo "$as_me:43205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -43111,23 +43213,23 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43114: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:43216: 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:43118: checking if -lm needed for math functions" >&5
+echo "$as_me:43220: 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 43125 "configure"
+#line 43227 "configure"
 #include "confdefs.h"
 
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <math.h>
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
 
 int
 main (void)
@@ -43138,16 +43240,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43144: \$? = $ac_status" >&5
+  echo "$as_me:43246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43150: \$? = $ac_status" >&5
+  echo "$as_me:43252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -43157,11 +43259,63 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:43160: result: $cf_cv_need_libm" >&5
+echo "$as_me:43262: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
+
 if test "$cf_cv_need_libm" = yes
 then
 
+	cf_save_LIBS="$LIBS"
+	LIBS="$LIBS -lm"
+	echo "$as_me:43270: checking if -lm is available for math functions" >&5
+echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+if test "${cf_cv_have_libm+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cat >"conftest.$ac_ext" <<_ACEOF
+#line 43277 "configure"
+#include "confdefs.h"
+
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
+
+int
+main (void)
+{
+double x = rand(); printf("result = %g\\n", sin(x))
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:43293: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:43296: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:43299: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:43302: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_have_libm=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_cv_have_libm=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:43312: result: $cf_cv_have_libm" >&5
+echo "${ECHO_T}$cf_cv_have_libm" >&6
+	LIBS="$cf_save_LIBS"
+
+	if test "$cf_cv_have_libm" = yes
+	then
+
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
@@ -43178,6 +43332,18 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
+	fi
+else
+	cf_cv_have_libm=yes
+fi
+
+if test "$cf_cv_have_libm" = yes
+then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_MATH_FUNCS 1
+EOF
+
 fi
 
 cf_add_libs="$LIBS"
@@ -43199,23 +43365,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:43202: checking for $ac_header" >&5
+echo "$as_me:43368: 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 43208 "configure"
+#line 43374 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43212: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:43378: \"$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:43218: \$? = $ac_status" >&5
+  echo "$as_me:43384: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43234,7 +43400,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:43237: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:43403: 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
@@ -43247,7 +43413,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:43250: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:43416: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -43255,7 +43421,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:43258: checking if directory-editor code should be used" >&5
+echo "$as_me:43424: 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.
@@ -43272,7 +43438,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:43275: result: $use_dired" >&5
+echo "$as_me:43441: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -43282,7 +43448,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:43285: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:43451: 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.
@@ -43299,10 +43465,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43302: result: $enableval" >&5
+	echo "$as_me:43468: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43305: checking if DirEd mode should override keys" >&5
+	echo "$as_me:43471: 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.
@@ -43326,10 +43492,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43329: result: $enableval" >&5
+	echo "$as_me:43495: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43332: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:43498: 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.
@@ -43353,10 +43519,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43356: result: $enableval" >&5
+	echo "$as_me:43522: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43359: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:43525: 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.
@@ -43373,10 +43539,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43376: result: $enableval" >&5
+	echo "$as_me:43542: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43379: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:43545: 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.
@@ -43400,10 +43566,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43403: result: $enableval" >&5
+	echo "$as_me:43569: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43406: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:43572: 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.
@@ -43427,10 +43593,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43430: result: $enableval" >&5
+	echo "$as_me:43596: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43433: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:43599: 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.
@@ -43454,10 +43620,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43457: result: $enableval" >&5
+	echo "$as_me:43623: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43460: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:43626: 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.
@@ -43481,11 +43647,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43484: result: $enableval" >&5
+	echo "$as_me:43650: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:43488: checking if you want long-directory listings" >&5
+echo "$as_me:43654: 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.
@@ -43509,10 +43675,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:43512: result: $enableval" >&5
+echo "$as_me:43678: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:43515: checking if parent-directory references are permitted" >&5
+echo "$as_me:43681: 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.
@@ -43529,7 +43695,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:43532: result: $enableval" >&5
+echo "$as_me:43698: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET="telnet"
@@ -43537,7 +43703,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:43540: checking for $ac_word" >&5
+echo "$as_me:43706: 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
@@ -43554,7 +43720,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:43557: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43723: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43565,10 +43731,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:43568: result: $TELNET" >&5
+  echo "$as_me:43734: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:43571: result: no" >&5
+  echo "$as_me:43737: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43627,7 +43793,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43630: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43796: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -43645,7 +43811,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:43648: checking for $ac_word" >&5
+echo "$as_me:43814: 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
@@ -43662,7 +43828,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:43665: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43831: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43673,10 +43839,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:43676: result: $TN3270" >&5
+  echo "$as_me:43842: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:43679: result: no" >&5
+  echo "$as_me:43845: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43735,7 +43901,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43738: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43904: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -43753,7 +43919,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:43756: checking for $ac_word" >&5
+echo "$as_me:43922: 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
@@ -43770,7 +43936,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:43773: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43939: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43781,10 +43947,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:43784: result: $RLOGIN" >&5
+  echo "$as_me:43950: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:43787: result: no" >&5
+  echo "$as_me:43953: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43843,7 +44009,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43846: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44012: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -43861,7 +44027,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:43864: checking for $ac_word" >&5
+echo "$as_me:44030: 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
@@ -43878,7 +44044,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:43881: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44047: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43889,10 +44055,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:43892: result: $MV" >&5
+  echo "$as_me:44058: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:43895: result: no" >&5
+  echo "$as_me:44061: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43951,7 +44117,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43954: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44120: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -43969,7 +44135,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:43972: checking for $ac_word" >&5
+echo "$as_me:44138: 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
@@ -43986,7 +44152,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:43989: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44155: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43997,10 +44163,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:44000: result: $GZIP" >&5
+  echo "$as_me:44166: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:44003: result: no" >&5
+  echo "$as_me:44169: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44059,7 +44225,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44062: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44228: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -44077,7 +44243,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:44080: checking for $ac_word" >&5
+echo "$as_me:44246: 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
@@ -44094,7 +44260,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:44097: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44263: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44105,10 +44271,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:44108: result: $UNCOMPRESS" >&5
+  echo "$as_me:44274: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:44111: result: no" >&5
+  echo "$as_me:44277: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44167,7 +44333,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44170: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44336: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -44185,7 +44351,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:44188: checking for $ac_word" >&5
+echo "$as_me:44354: 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
@@ -44202,7 +44368,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:44205: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44371: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44213,10 +44379,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:44216: result: $UNZIP" >&5
+  echo "$as_me:44382: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:44219: result: no" >&5
+  echo "$as_me:44385: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44275,7 +44441,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44278: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44444: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -44293,7 +44459,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:44296: checking for $ac_word" >&5
+echo "$as_me:44462: 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
@@ -44310,7 +44476,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:44313: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44479: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44321,10 +44487,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:44324: result: $BZIP2" >&5
+  echo "$as_me:44490: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:44327: result: no" >&5
+  echo "$as_me:44493: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44383,7 +44549,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44386: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44552: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -44401,7 +44567,7 @@ 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 "$as_me:44570: 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
@@ -44418,7 +44584,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_BROTLI="$ac_dir/$ac_word"
-   echo "$as_me:44421: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44587: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44429,10 +44595,10 @@ fi
 BROTLI=$ac_cv_path_BROTLI
 
 if test -n "$BROTLI"; then
-  echo "$as_me:44432: result: $BROTLI" >&5
+  echo "$as_me:44598: result: $BROTLI" >&5
 echo "${ECHO_T}$BROTLI" >&6
 else
-  echo "$as_me:44435: result: no" >&5
+  echo "$as_me:44601: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44491,7 +44657,7 @@ 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
+echo "${as_me:-configure}:44660: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BROTLI_PATH "$cf_path_prog"
@@ -44509,7 +44675,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:44512: checking for $ac_word" >&5
+echo "$as_me:44678: 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
@@ -44526,7 +44692,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:44529: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44695: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44537,10 +44703,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:44540: result: $TAR" >&5
+  echo "$as_me:44706: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:44543: result: no" >&5
+  echo "$as_me:44709: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44599,7 +44765,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44602: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44768: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -44657,7 +44823,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:44660: checking for $ac_word" >&5
+echo "$as_me:44826: 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
@@ -44674,7 +44840,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:44677: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44843: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44685,10 +44851,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:44688: result: $COMPRESS" >&5
+  echo "$as_me:44854: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:44691: result: no" >&5
+  echo "$as_me:44857: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44747,7 +44913,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44750: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44916: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -44765,7 +44931,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:44768: checking for $ac_word" >&5
+echo "$as_me:44934: 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
@@ -44782,7 +44948,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:44785: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44951: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44793,10 +44959,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:44796: result: $RM" >&5
+  echo "$as_me:44962: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:44799: result: no" >&5
+  echo "$as_me:44965: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44855,7 +45021,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44858: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45024: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -44873,7 +45039,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:44876: checking for $ac_word" >&5
+echo "$as_me:45042: 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
@@ -44890,7 +45056,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:44893: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45059: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44901,10 +45067,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:44904: result: $UUDECODE" >&5
+  echo "$as_me:45070: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:44907: result: no" >&5
+  echo "$as_me:45073: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44963,7 +45129,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44966: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45132: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -44981,7 +45147,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:44984: checking for $ac_word" >&5
+echo "$as_me:45150: 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
@@ -44998,7 +45164,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:45001: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45167: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45009,10 +45175,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:45012: result: $ZCAT" >&5
+  echo "$as_me:45178: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:45015: result: no" >&5
+  echo "$as_me:45181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45071,7 +45237,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45074: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45240: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -45089,7 +45255,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:45092: checking for $ac_word" >&5
+echo "$as_me:45258: 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
@@ -45106,7 +45272,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:45109: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45275: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45117,10 +45283,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:45120: result: $ZIP" >&5
+  echo "$as_me:45286: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:45123: result: no" >&5
+  echo "$as_me:45289: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45179,7 +45345,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45182: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45348: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -45207,7 +45373,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:45210: checking for $ac_word" >&5
+echo "$as_me:45376: 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
@@ -45224,7 +45390,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:45227: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45393: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45235,10 +45401,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:45238: result: $INSTALL" >&5
+  echo "$as_me:45404: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:45241: result: no" >&5
+  echo "$as_me:45407: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45297,7 +45463,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45300: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45466: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -45327,7 +45493,7 @@ if test "$cf_cv_screen" = pdcurses ; then
 	case "$host_os" in
 	(mingw*)
 
-echo "$as_me:45330: checking for initscr in -lpdcurses" >&5
+echo "$as_me:45496: 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
@@ -45335,7 +45501,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45338 "configure"
+#line 45504 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -45354,16 +45520,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45360: \$? = $ac_status" >&5
+  echo "$as_me:45526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45366: \$? = $ac_status" >&5
+  echo "$as_me:45532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -45374,7 +45540,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:45377: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:45543: 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
 
@@ -45396,13 +45562,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:45399: checking for winwstr" >&5
+	echo "$as_me:45565: 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 45405 "configure"
+#line 45571 "configure"
 #include "confdefs.h"
 #define winwstr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45433,16 +45599,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45439: \$? = $ac_status" >&5
+  echo "$as_me:45605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45445: \$? = $ac_status" >&5
+  echo "$as_me:45611: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -45452,7 +45618,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45455: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:45621: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test "$ac_cv_func_winwstr" = yes; then
 
@@ -45462,13 +45628,13 @@ EOF
 
 fi
 
-	echo "$as_me:45465: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:45631: 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 45471 "configure"
+#line 45637 "configure"
 #include "confdefs.h"
 #define pdcurses_dll_iname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45499,16 +45665,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45505: \$? = $ac_status" >&5
+  echo "$as_me:45671: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45511: \$? = $ac_status" >&5
+  echo "$as_me:45677: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -45518,7 +45684,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45521: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:45687: 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
 
@@ -45535,7 +45701,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:45538: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:45704: 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=
 
@@ -45546,14 +45712,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:45549: result: yes" >&5
+	echo "$as_me:45715: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45552: result: no" >&5
+	echo "$as_me:45718: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45556: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:45722: 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=
 
@@ -45564,14 +45730,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:45567: result: yes" >&5
+	echo "$as_me:45733: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45570: result: no" >&5
+	echo "$as_me:45736: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45574: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:45740: 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=
 
@@ -45582,14 +45748,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:45585: result: yes" >&5
+	echo "$as_me:45751: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45588: result: no" >&5
+	echo "$as_me:45754: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45592: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:45758: 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=
 
@@ -45600,10 +45766,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:45603: result: yes" >&5
+	echo "$as_me:45769: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45606: result: no" >&5
+	echo "$as_me:45772: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45623,17 +45789,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}:45626: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:45792: 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}:45632: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45798: 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}:45636: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45802: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45764,20 +45930,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}:45767: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:45933: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:45773: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:45939: 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 45780 "configure"
+#line 45946 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -45794,16 +45960,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45800: \$? = $ac_status" >&5
+  echo "$as_me:45966: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45806: \$? = $ac_status" >&5
+  echo "$as_me:45972: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -45813,7 +45979,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45816: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:45982: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -45825,7 +45991,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:45828: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:45994: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -45833,17 +45999,17 @@ echo "${as_me:-configure}:45828: 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}:45836: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:46002: 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}:45842: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46008: 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}:45846: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46012: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45963,12 +46129,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:45966: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46132: 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}:45971: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46137: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -45976,12 +46142,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:45979: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46145: 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}:45984: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46150: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -45992,7 +46158,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}:45995: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:46161: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -46017,17 +46183,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}:46020: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:46186: 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}:46026: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46192: 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}:46030: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46196: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46148,7 +46314,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:46151: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:46317: 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
@@ -46156,7 +46322,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 46159 "configure"
+#line 46325 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -46175,16 +46341,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46181: \$? = $ac_status" >&5
+  echo "$as_me:46347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46187: \$? = $ac_status" >&5
+  echo "$as_me:46353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -46195,7 +46361,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:46198: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:46364: 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
 
@@ -46231,17 +46397,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}:46234: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:46400: 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}:46240: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46406: 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}:46244: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46410: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46361,24 +46527,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46364: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:46530: 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}:46371: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:46537: 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}:46377: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46543: 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}:46381: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46547: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46498,24 +46664,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46501: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:46667: 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}:46508: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:46674: 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}:46514: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46680: 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}:46518: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46684: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46635,24 +46801,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46638: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:46804: 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}:46645: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46811: 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}:46651: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46817: 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}:46655: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46821: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46772,7 +46938,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46775: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:46941: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -46785,17 +46951,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}:46788: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46954: 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}:46794: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46960: 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}:46798: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46964: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46916,14 +47082,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:46919: checking for usable X dependency" >&5
+echo "$as_me:47085: 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 46926 "configure"
+#line 47092 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -46942,16 +47108,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46948: \$? = $ac_status" >&5
+  echo "$as_me:47114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46954: \$? = $ac_status" >&5
+  echo "$as_me:47120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -46961,30 +47127,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:46964: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:47130: 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}:46970: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:47136: 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}:46977: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:47143: 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}:46983: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47149: 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}:46987: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47153: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47107,12 +47273,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47110: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47276: 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}:47115: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47281: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47120,14 +47286,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:47123: checking for usable X Toolkit package" >&5
+echo "$as_me:47289: 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 47130 "configure"
+#line 47296 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -47142,16 +47308,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47148: \$? = $ac_status" >&5
+  echo "$as_me:47314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47154: \$? = $ac_status" >&5
+  echo "$as_me:47320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -47161,7 +47327,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47164: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:47330: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -47175,22 +47341,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}:47178: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:47344: 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}:47183: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:47349: 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}:47189: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47355: 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}:47193: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47359: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47309,17 +47475,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}:47312: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:47478: 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}:47318: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47484: 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}:47322: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47488: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47448,12 +47614,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47451: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47617: 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}:47456: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47622: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47473,7 +47639,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47476: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47642: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -47558,7 +47724,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}:47561: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:47727: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -47568,7 +47734,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}:47571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:47737: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -47578,7 +47744,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}:47581: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:47747: 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"
@@ -47587,7 +47753,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47590 "configure"
+#line 47756 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -47599,16 +47765,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47605: \$? = $ac_status" >&5
+  echo "$as_me:47771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47611: \$? = $ac_status" >&5
+  echo "$as_me:47777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -47616,12 +47782,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47619: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47785: 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}:47624: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:47790: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -47629,13 +47795,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:47632: checking for XOpenDisplay" >&5
+	echo "$as_me:47798: 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 47638 "configure"
+#line 47804 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47666,16 +47832,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47672: \$? = $ac_status" >&5
+  echo "$as_me:47838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47678: \$? = $ac_status" >&5
+  echo "$as_me:47844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -47685,13 +47851,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47688: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:47854: 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:47694: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:47860: 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
@@ -47699,7 +47865,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47702 "configure"
+#line 47868 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47718,16 +47884,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47724: \$? = $ac_status" >&5
+  echo "$as_me:47890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47730: \$? = $ac_status" >&5
+  echo "$as_me:47896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -47738,7 +47904,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47741: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:47907: 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
 
@@ -47762,13 +47928,13 @@ fi
 
 fi
 
-	echo "$as_me:47765: checking for XtAppInitialize" >&5
+	echo "$as_me:47931: 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 47771 "configure"
+#line 47937 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47799,16 +47965,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47805: \$? = $ac_status" >&5
+  echo "$as_me:47971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47811: \$? = $ac_status" >&5
+  echo "$as_me:47977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -47818,13 +47984,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47821: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:47987: 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:47827: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:47993: 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
@@ -47832,7 +47998,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47835 "configure"
+#line 48001 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47851,16 +48017,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47854: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47857: \$? = $ac_status" >&5
+  echo "$as_me:48023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47863: \$? = $ac_status" >&5
+  echo "$as_me:48029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -47871,7 +48037,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47874: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:48040: 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
 
@@ -47888,7 +48054,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:47891: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:48057: 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
@@ -47929,14 +48095,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:47932: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:48098: 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:47935: checking for $cf_test" >&5
+			echo "$as_me:48101: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 47939 "configure"
+#line 48105 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -47950,16 +48116,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:47953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:47956: \$? = $ac_status" >&5
+  echo "$as_me:48122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:47959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47962: \$? = $ac_status" >&5
+  echo "$as_me:48128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -47968,7 +48134,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:47971: result: $cf_result" >&5
+		echo "$as_me:48137: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -47984,7 +48150,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:47987: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:48153: 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
 
@@ -48049,10 +48215,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:48052: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:48218: 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 48055 "configure"
+#line 48221 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -48068,16 +48234,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48074: \$? = $ac_status" >&5
+  echo "$as_me:48240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48080: \$? = $ac_status" >&5
+  echo "$as_me:48246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -48086,7 +48252,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:48089: result: $cf_result" >&5
+		echo "$as_me:48255: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -48103,7 +48269,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:48106: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:48272: 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
@@ -48137,7 +48303,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:48140: checking for $ac_word" >&5
+echo "$as_me:48306: 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
@@ -48152,7 +48318,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:48155: found $ac_dir/$ac_word" >&5
+echo "$as_me:48321: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48160,10 +48326,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:48163: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:48329: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48166: result: no" >&5
+  echo "$as_me:48332: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48176,7 +48342,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:48179: checking for $ac_word" >&5
+echo "$as_me:48345: 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
@@ -48191,7 +48357,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:48194: found $ac_dir/$ac_word" >&5
+echo "$as_me:48360: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48199,10 +48365,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:48202: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:48368: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48205: result: no" >&5
+  echo "$as_me:48371: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48337,7 +48503,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48340: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48506: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -48422,7 +48588,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}:48425: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:48591: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -48432,7 +48598,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}:48435: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:48601: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -48442,7 +48608,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}:48445: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:48611: 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"
@@ -48451,7 +48617,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48454 "configure"
+#line 48620 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -48463,16 +48629,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48469: \$? = $ac_status" >&5
+  echo "$as_me:48635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48475: \$? = $ac_status" >&5
+  echo "$as_me:48641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -48480,12 +48646,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48483: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48649: 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}:48488: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:48654: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -48493,7 +48659,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:48496: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:48662: 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
@@ -48501,7 +48667,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48504 "configure"
+#line 48670 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48520,16 +48686,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48526: \$? = $ac_status" >&5
+  echo "$as_me:48692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48532: \$? = $ac_status" >&5
+  echo "$as_me:48698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -48540,7 +48706,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48543: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:48709: 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
 
@@ -48562,7 +48728,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:48565: checking for XCurses library" >&5
+echo "$as_me:48731: 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
@@ -48585,7 +48751,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48588 "configure"
+#line 48754 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -48600,16 +48766,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48606: \$? = $ac_status" >&5
+  echo "$as_me:48772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48612: \$? = $ac_status" >&5
+  echo "$as_me:48778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -48620,7 +48786,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:48623: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:48789: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -48635,23 +48801,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:48638: checking for xcurses.h" >&5
+	echo "$as_me:48804: 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 48644 "configure"
+#line 48810 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:48648: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48814: \"$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:48654: \$? = $ac_status" >&5
+  echo "$as_me:48820: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48670,7 +48836,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48673: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:48839: 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
 
@@ -48681,7 +48847,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:48684: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:48850: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -48690,7 +48856,7 @@ fi
 	esac
 else
 
-echo "$as_me:48693: checking if we can include termio.h with curses" >&5
+echo "$as_me:48859: 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
@@ -48700,7 +48866,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 48703 "configure"
+#line 48869 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -48714,16 +48880,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48883: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48720: \$? = $ac_status" >&5
+  echo "$as_me:48886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48726: \$? = $ac_status" >&5
+  echo "$as_me:48892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -48736,7 +48902,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:48739: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:48905: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test "$cf_cv_termio_and_curses" = yes &&
@@ -48753,23 +48919,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:48756: checking for $ac_header" >&5
+echo "$as_me:48922: 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 48762 "configure"
+#line 48928 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:48766: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48932: \"$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:48772: \$? = $ac_status" >&5
+  echo "$as_me:48938: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48788,7 +48954,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48791: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:48957: 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
@@ -48800,7 +48966,7 @@ done
 
 	fi
 
-echo "$as_me:48803: checking if curses supports alternate-character set" >&5
+echo "$as_me:48969: 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
@@ -48809,7 +48975,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48812 "configure"
+#line 48978 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48823,16 +48989,16 @@ chtype x = ${mapname}['l']; ${mapname}['m'] = 0; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48829: \$? = $ac_status" >&5
+  echo "$as_me:48995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48835: \$? = $ac_status" >&5
+  echo "$as_me:49001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -48846,21 +49012,21 @@ done
 
 fi
 
-echo "$as_me:48849: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:49015: 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:48856: checking if curses supports fancy attributes" >&5
+echo "$as_me:49022: 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 48863 "configure"
+#line 49029 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48878,16 +49044,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48884: \$? = $ac_status" >&5
+  echo "$as_me:49050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48890: \$? = $ac_status" >&5
+  echo "$as_me:49056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -48899,14 +49065,14 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48902: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:49068: 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:48909: checking for function curses_version" >&5
+echo "$as_me:49075: 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
@@ -48916,7 +49082,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 48919 "configure"
+#line 49085 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48929,15 +49095,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:48932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48935: \$? = $ac_status" >&5
+  echo "$as_me:49101: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:48937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48940: \$? = $ac_status" >&5
+  echo "$as_me:49106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -48952,7 +49118,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:48955: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:49121: 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
@@ -48960,14 +49126,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:48963: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:49129: 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 48970 "configure"
+#line 49136 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48986,16 +49152,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48992: \$? = $ac_status" >&5
+  echo "$as_me:49158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48998: \$? = $ac_status" >&5
+  echo "$as_me:49164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -49007,10 +49173,10 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49010: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:49176: 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:49013: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:49179: 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
@@ -49020,14 +49186,14 @@ EOF
 fi
 fi
 
-echo "$as_me:49023: checking if curses supports color attributes" >&5
+echo "$as_me:49189: 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 49030 "configure"
+#line 49196 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49047,16 +49213,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49053: \$? = $ac_status" >&5
+  echo "$as_me:49219: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49059: \$? = $ac_status" >&5
+  echo "$as_me:49225: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_color_curses=yes
 else
@@ -49068,7 +49234,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49071: result: $cf_cv_color_curses" >&5
+echo "$as_me:49237: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test "$cf_cv_color_curses" = yes ; then
 
@@ -49092,23 +49258,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:49095: checking for $ac_header" >&5
+echo "$as_me:49261: 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 49101 "configure"
+#line 49267 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:49105: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:49271: \"$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:49111: \$? = $ac_status" >&5
+  echo "$as_me:49277: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -49127,7 +49293,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:49130: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:49296: 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
@@ -49144,10 +49310,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:49147: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:49313: 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 49150 "configure"
+#line 49316 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -49159,16 +49325,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49162: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49165: \$? = $ac_status" >&5
+  echo "$as_me:49331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49171: \$? = $ac_status" >&5
+  echo "$as_me:49337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -49176,7 +49342,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49179 "configure"
+#line 49345 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -49190,16 +49356,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49196: \$? = $ac_status" >&5
+  echo "$as_me:49362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49202: \$? = $ac_status" >&5
+  echo "$as_me:49368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -49215,12 +49381,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:49218: result: $termios_bad" >&5
+	echo "$as_me:49384: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:49223: checking declaration of size-change" >&5
+echo "$as_me:49389: 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
@@ -49241,7 +49407,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49244 "configure"
+#line 49410 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -49291,16 +49457,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49297: \$? = $ac_status" >&5
+  echo "$as_me:49463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49303: \$? = $ac_status" >&5
+  echo "$as_me:49469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -49319,7 +49485,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49322: result: $cf_cv_sizechange" >&5
+echo "$as_me:49488: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -49337,14 +49503,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:49340: checking if ttytype is declared in curses library" >&5
+echo "$as_me:49506: 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 49347 "configure"
+#line 49513 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -49356,16 +49522,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49362: \$? = $ac_status" >&5
+  echo "$as_me:49528: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49368: \$? = $ac_status" >&5
+  echo "$as_me:49534: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -49377,7 +49543,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49380: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:49546: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test "$cf_cv_have_ttytype" = yes &&
 cat >>confdefs.h <<\EOF
@@ -49386,14 +49552,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:49389: checking if curses supports wide characters" >&5
+echo "$as_me:49555: 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 49396 "configure"
+#line 49562 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49412,16 +49578,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49418: \$? = $ac_status" >&5
+  echo "$as_me:49584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49424: \$? = $ac_status" >&5
+  echo "$as_me:49590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -49432,7 +49598,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49435: result: $cf_cv_widec_curses" >&5
+echo "$as_me:49601: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -49442,14 +49608,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:49445: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:49611: 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 49452 "configure"
+#line 49618 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49463,23 +49629,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49466: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49632: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49469: \$? = $ac_status" >&5
+  echo "$as_me:49635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49475: \$? = $ac_status" >&5
+  echo "$as_me:49641: \$? = $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 49482 "configure"
+#line 49648 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49494,16 +49660,16 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49500: \$? = $ac_status" >&5
+  echo "$as_me:49666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49506: \$? = $ac_status" >&5
+  echo "$as_me:49672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -49515,7 +49681,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:49518: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:49684: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -49538,7 +49704,7 @@ fi
 
 	fi
 
-echo "$as_me:49541: checking definition to turn on extended curses functions" >&5
+echo "$as_me:49707: 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
@@ -49546,7 +49712,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 49549 "configure"
+#line 49715 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49578,16 +49744,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:49581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49584: \$? = $ac_status" >&5
+  echo "$as_me:49750: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49590: \$? = $ac_status" >&5
+  echo "$as_me:49756: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -49597,7 +49763,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49600 "configure"
+#line 49766 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -49622,16 +49788,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49628: \$? = $ac_status" >&5
+  echo "$as_me:49794: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49634: \$? = $ac_status" >&5
+  echo "$as_me:49800: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -49645,7 +49811,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49648: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:49814: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -49657,7 +49823,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:49660: checking for term.h" >&5
+echo "$as_me:49826: 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
@@ -49678,7 +49844,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49681 "configure"
+#line 49847 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49692,16 +49858,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49698: \$? = $ac_status" >&5
+  echo "$as_me:49864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49704: \$? = $ac_status" >&5
+  echo "$as_me:49870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -49720,7 +49886,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49723 "configure"
+#line 49889 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49738,16 +49904,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49744: \$? = $ac_status" >&5
+  echo "$as_me:49910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49750: \$? = $ac_status" >&5
+  echo "$as_me:49916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -49762,7 +49928,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:49765: result: $cf_cv_term_header" >&5
+echo "$as_me:49931: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -49789,7 +49955,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:49792: checking for unctrl.h" >&5
+echo "$as_me:49958: 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
@@ -49810,7 +49976,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49813 "configure"
+#line 49979 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49824,16 +49990,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49830: \$? = $ac_status" >&5
+  echo "$as_me:49996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49836: \$? = $ac_status" >&5
+  echo "$as_me:50002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -49846,12 +50012,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49849: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:50015: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:49854: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:50020: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -49907,10 +50073,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:49910: checking for ${cf_func}" >&5
+	echo "$as_me:50076: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:49913: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:50079: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -49919,7 +50085,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 49922 "configure"
+#line 50088 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -49952,16 +50118,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49958: \$? = $ac_status" >&5
+  echo "$as_me:50124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49964: \$? = $ac_status" >&5
+  echo "$as_me:50130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -49977,7 +50143,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:49980: result: $cf_result" >&5
+	echo "$as_me:50146: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -49994,13 +50160,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:49997: checking for $ac_func" >&5
+echo "$as_me:50163: 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 50003 "configure"
+#line 50169 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -50031,16 +50197,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50037: \$? = $ac_status" >&5
+  echo "$as_me:50203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50043: \$? = $ac_status" >&5
+  echo "$as_me:50209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -50050,7 +50216,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:50053: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:50219: 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
@@ -50064,12 +50230,12 @@ fi
 
 if test "$use_color_style" != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:50067: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50233: 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:50072: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50238: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -50077,7 +50243,7 @@ fi
 
 if test "$use_scrollbar" != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:50080: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:50246: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -50090,7 +50256,7 @@ fi
 
 # use rpath for libraries in unusual places
 
-echo "$as_me:50093: checking if rpath-hack should be disabled" >&5
+echo "$as_me:50259: 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.
@@ -50108,22 +50274,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:50111: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:50277: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:50116: checking for updated LDFLAGS" >&5
+echo "$as_me:50282: 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:50119: result: maybe" >&5
+	echo "$as_me:50285: 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:50126: checking for $ac_word" >&5
+echo "$as_me:50292: 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
@@ -50138,7 +50304,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:50141: found $ac_dir/$ac_word" >&5
+echo "$as_me:50307: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -50146,10 +50312,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:50149: result: $cf_ldd_prog" >&5
+  echo "$as_me:50315: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:50152: result: no" >&5
+  echo "$as_me:50318: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50163,7 +50329,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 50166 "configure"
+#line 50332 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -50175,16 +50341,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50181: \$? = $ac_status" >&5
+  echo "$as_me:50347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50187: \$? = $ac_status" >&5
+  echo "$as_me:50353: \$? = $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`
@@ -50212,7 +50378,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}:50215: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:50381: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -50224,11 +50390,11 @@ echo "${as_me:-configure}:50215: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50227: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50393: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50231: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50397: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -50265,7 +50431,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50268: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50434: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50278,11 +50444,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50281: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50447: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50285: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50451: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -50319,7 +50485,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50322: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50488: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50332,14 +50498,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50335: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50501: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50339: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50505: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:50342: result: no" >&5
+	echo "$as_me:50508: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50454,7 +50620,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:50457: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:50623: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -50633,7 +50799,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:50636: error: ambiguous option: $1
+    { { echo "$as_me:50802: 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;}
@@ -50652,7 +50818,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:50655: error: unrecognized option: $1
+  -*) { { echo "$as_me:50821: 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;}
@@ -50705,7 +50871,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:50708: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:50874: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -50824,6 +50990,7 @@ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@YACC@,$YACC,;t t
 s,@LINT@,$LINT,;t t
 s,@LINT_OPTS@,$LINT_OPTS,;t t
+s,@LINT_LIBS@,$LINT_LIBS,;t t
 s,@FGREP@,$FGREP,;t t
 s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t
 s,@MAKE_NO_PHONY@,$MAKE_NO_PHONY,;t t
@@ -51068,7 +51235,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:51071: creating $ac_file" >&5
+    { echo "$as_me:51238: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -51086,7 +51253,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:51089: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51256: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -51099,7 +51266,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51102: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51269: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51115,7 +51282,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:51118: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:51285: 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;}
@@ -51124,7 +51291,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:51127: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:51294: 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;}
@@ -51161,7 +51328,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:51164: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:51331: 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;}
@@ -51172,7 +51339,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:51175: WARNING: Some variables may not be substituted:
+      { echo "$as_me:51342: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -51221,7 +51388,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:51224: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:51391: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -51232,7 +51399,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:51235: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51402: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -51245,7 +51412,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51248: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51415: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51363,7 +51530,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:51366: $ac_file is unchanged" >&5
+      { echo "$as_me:51533: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \