about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES8
-rw-r--r--WWW/Library/Implementation/HTAABrow.c25
-rw-r--r--WWW/Library/Implementation/HTAAProt.c10
-rw-r--r--WWW/Library/Implementation/HTAccess.c7
-rw-r--r--WWW/Library/Implementation/HTAssoc.c8
-rw-r--r--WWW/Library/Implementation/HTChunk.c28
-rw-r--r--WWW/Library/Implementation/HTDOS.c6
-rw-r--r--WWW/Library/Implementation/HTFTP.c79
-rw-r--r--WWW/Library/Implementation/HTFile.c3
-rw-r--r--WWW/Library/Implementation/HTFinger.c11
-rw-r--r--WWW/Library/Implementation/HTMIME.c4
-rw-r--r--WWW/Library/Implementation/HTMLGen.c13
-rw-r--r--WWW/Library/Implementation/HTParse.c34
-rw-r--r--WWW/Library/Implementation/HTPlain.c10
-rw-r--r--WWW/Library/Implementation/HTTP.c28
-rw-r--r--WWW/Library/Implementation/HTWSRC.c7
-rw-r--r--WWW/Library/Implementation/SGML.c4
-rw-r--r--aclocal.m428
-rw-r--r--config.hin3
-rwxr-xr-xconfigure2779
-rw-r--r--configure.in4
-rw-r--r--src/HTAlert.c10
-rw-r--r--src/LYCurses.c59
-rw-r--r--src/LYCurses.h18
-rw-r--r--src/LYKeymap.c13
-rw-r--r--src/LYMail.c29
-rw-r--r--src/LYShowInfo.c10
-rw-r--r--src/UCAux.c9
28 files changed, 1721 insertions, 1526 deletions
diff --git a/CHANGES b/CHANGES
index 40b8e0c1..84c30ac8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,13 @@
--- $LynxId: CHANGES,v 1.356 2009/01/02 02:01:19 tom Exp $
+-- $LynxId: CHANGES,v 1.359 2009/01/03 18:46:11 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2009-01-?? (2.8.7???.??)
+* modify UCSetBoxChars() to let line-drawing work with PDCurses, as well as
+  any fancy-curses implementation that is running in ASCII or Latin-1 -TD
+* add a configure check for curses type "chtype" -TD
+* fix for an ASCII dependency in LYKeymap.c -PG
 * update id.po, nl.pl, tr.po from
     http://translationproject.org/latest/lynx/
 * change configure script to check for "ar" archiver options, from tin bug
@@ -11,7 +15,7 @@ Changes since Lynx 2.8 release
 * update config.guess (2008-12-19), config.sub (2008-12-11)
 * use putenv() in preference to unsetenv() in LYReadCFG.c, noting that it is
   a deprecated BSD interface -TD
-* miscellaneous fixes for less-strict compiler warnings -TD
+* miscellaneous fixes for gcc type-conversion warnings -TD
 * remove trailing comma from enumeration UCStatus which causes strict-compiler
   warning -TD
 
diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c
index 9d7efab5..1b859e24 100644
--- a/WWW/Library/Implementation/HTAABrow.c
+++ b/WWW/Library/Implementation/HTAABrow.c
@@ -1,5 +1,7 @@
-
-/* MODULE							HTAABrow.c
+/*
+ * $LynxId: HTAABrow.c,v 1.29 2009/01/03 00:55:16 tom Exp $
+ *
+ * MODULE							HTAABrow.c
  *		BROWSER SIDE ACCESS AUTHORIZATION MODULE
  *
  *	Contains the code for keeping track on server hostnames,
@@ -140,8 +142,9 @@ static int proxy_portnumber = 80;
 void HTAAForwardAuth_set(const char *scheme_name,
 			 const char *scheme_specifics)
 {
-    int len = 20 + (scheme_name ? strlen(scheme_name) : 0)
-    + (scheme_specifics ? strlen(scheme_specifics) : 0);
+    unsigned len = (20
+		    + (scheme_name ? strlen(scheme_name) : 0)
+		    + (scheme_specifics ? strlen(scheme_specifics) : 0));
 
     FREE(HTAAForwardAuth);
     if ((HTAAForwardAuth = typecallocn(char, len)) == 0)
@@ -556,7 +559,7 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, BOOL IsPr
 {
     char *cleartext = NULL;	/* Cleartext presentation */
     char *ciphertext = NULL;	/* Encrypted presentation */
-    int len;
+    unsigned len;
     char *msg = NULL;
     char *username = NULL;
     char *password = NULL;
@@ -620,9 +623,9 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, BOOL IsPr
 	 * prompting function, but the password is NULL-ed and always replaced. 
 	 * - FM
 	 */
-	len = strlen(realm->realmname) +
-	    strlen(theHost ?
-		   theHost : "??") + 50;
+	len = (strlen(realm->realmname) +
+	       strlen(theHost ?
+		      theHost : "??") + 50);
 	HTSprintf0(&msg, gettext("Username for '%s' at %s '%s%s':"),
 		   realm->realmname,
 		   (IsProxy ? "proxy" : "server"),
@@ -654,8 +657,8 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, BOOL IsPr
 	}
     }
 
-    len = strlen(NonNull(realm->username)) +
-	strlen(NonNull(realm->password)) + 3;
+    len = (strlen(NonNull(realm->username)) +
+	   strlen(NonNull(realm->password)) + 3);
 
     if (scheme == HTAA_PUBKEY) {
 #ifdef PUBKEY
@@ -811,7 +814,7 @@ char *HTAA_composeAuth(const char *hostname,
     char *auth_string;
     BOOL retry;
     HTAAScheme scheme;
-    int len;
+    unsigned len;
 
     /*
      * Setup atexit() freeing if not done already.  - FM
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index 9e8a06d5..2f0ca7ca 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -1,5 +1,7 @@
-
-/* MODULE							HTAAProt.c
+/*
+ * $LynxId: HTAAProt.c,v 1.29 2009/01/03 02:00:14 tom Exp $
+ *
+ * MODULE							HTAAProt.c
  *		PROTECTION FILE PARSING MODULE
  *
  * AUTHORS:
@@ -659,7 +661,7 @@ const char *HTAA_UidToName(int uid)
 	    return data->name;
     }
 
-    if ((pw = getpwuid(uid)) != 0
+    if ((pw = getpwuid((uid_t) uid)) != 0
 	&& pw->pw_name != 0) {
 	CTRACE((tfp, "%s(%d) returned (%s:%d:...)\n",
 		"HTAA_UidToName: getpwuid",
@@ -726,7 +728,7 @@ const char *HTAA_GidToName(int gid)
 	    return data->name;
     }
 
-    if ((gr = getgrgid(gid)) != 0
+    if ((gr = getgrgid((gid_t) gid)) != 0
 	&& gr->gr_name != 0) {
 	CTRACE((tfp, "%s(%d) returned (%s:%d:...)\n",
 		"HTAA_GidToName: getgrgid",
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index f92df3a0..93902cd8 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAccess.c,v 1.67 2008/09/06 14:44:37 tom Exp $
+ * $LynxId: HTAccess.c,v 1.68 2009/01/03 01:31:41 tom Exp $
  *
  *		Access Manager					HTAccess.c
  *		==============
@@ -322,7 +322,7 @@ BOOL override_proxy(const char *addr)
     }
     if (!port)
 	port = 80;		/* Default */
-    h_len = strlen(Host);
+    h_len = (int) strlen(Host);
 
     while (*no_proxy) {
 	const char *end;
@@ -356,7 +356,8 @@ BOOL override_proxy(const char *addr)
 #ifdef CJK_EX			/* ASATAKU PROXY HACK */
 	if ((!templ_port || templ_port == port) &&
 	    (t_len > 0 && t_len <= h_len &&
-	     isdigit(UCH(*no_proxy)) && !strncmp(host, no_proxy, t_len))) {
+	     isdigit(UCH(*no_proxy)) &&
+	     !strncmp(host, no_proxy, (unsigned) t_len))) {
 	    FREE(host);
 	    return YES;
 	}
diff --git a/WWW/Library/Implementation/HTAssoc.c b/WWW/Library/Implementation/HTAssoc.c
index 112f70a9..64a7d1aa 100644
--- a/WWW/Library/Implementation/HTAssoc.c
+++ b/WWW/Library/Implementation/HTAssoc.c
@@ -1,5 +1,7 @@
-
-/* MODULE							HTAssoc.c
+/*
+ * $LynxId: HTAssoc.c,v 1.9 2009/01/03 01:59:16 tom Exp $
+ *
+ * MODULE							HTAssoc.c
  *	    ASSOCIATION LIST FOR STORING NAME-VALUE PAIRS.
  *	    NAMES NOT CASE SENSITIVE, AND ONLY COMMON LENGTH
  *	    IS CHECKED (allows abbreviations; well, length is
@@ -73,7 +75,7 @@ char *HTAssocList_lookup(HTAssocList *alist,
     HTAssoc *assoc;
 
     while (NULL != (assoc = (HTAssoc *) HTList_nextObject(cur))) {
-	if (!strncasecomp(assoc->name, name, strlen(name)))
+	if (!strncasecomp(assoc->name, name, (int) strlen(name)))
 	    return assoc->value;
     }
     return NULL;
diff --git a/WWW/Library/Implementation/HTChunk.c b/WWW/Library/Implementation/HTChunk.c
index 7f41c687..8c8ed8cc 100644
--- a/WWW/Library/Implementation/HTChunk.c
+++ b/WWW/Library/Implementation/HTChunk.c
@@ -1,4 +1,7 @@
-/*		Chunk handling:	Flexible arrays
+/*
+ * $LynxId: HTChunk.c,v 1.20 2009/01/03 01:21:34 tom Exp $
+ *
+ *		Chunk handling:	Flexible arrays
  *		===============================
  *
  */
@@ -61,11 +64,12 @@ HTChunk *HTChunkCreate2(int grow, size_t needed)
 
     HTChunkInit(ch, grow);
     if (needed > 0) {
-	ch->allocated = needed - 1 - ((needed - 1) % ch->growby)
-	    + ch->growby;	/* Round up */
+	/* Round up */
+	ch->allocated = (int) (needed - 1 - ((needed - 1) % ch->growby)
+			       + (unsigned) ch->growby);
 	CTRACE((tfp, "HTChunkCreate2: requested %d, allocate %d\n",
-		(int) needed, ch->allocated));
-	ch->data = typecallocn(char, ch->allocated);
+		(int) needed, (unsigned) ch->allocated));
+	ch->data = typecallocn(char, (unsigned) ch->allocated);
 
 	if (!ch->data)
 	    outofmem(__FILE__, "HTChunkCreate2 data");
@@ -108,8 +112,8 @@ BOOL HTChunkRealloc(HTChunk *ch, int growby)
     ch->allocated = ch->allocated + growby;
 
     data = (ch->data
-	    ? (char *) realloc(ch->data, ch->allocated)
-	    : typecallocn(char, ch->allocated));
+	    ? (char *) realloc(ch->data, (unsigned) ch->allocated)
+	    : typecallocn(char, (unsigned) ch->allocated));
 
     if (data) {
 	ch->data = data;
@@ -158,8 +162,8 @@ void HTChunkEnsure(HTChunk *ch, int needed)
     ch->allocated = needed - 1 - ((needed - 1) % ch->growby)
 	+ ch->growby;		/* Round up */
     ch->data = (ch->data
-		? (char *) realloc(ch->data, ch->allocated)
-		: typecallocn(char, ch->allocated));
+		? (char *) realloc(ch->data, (unsigned) ch->allocated)
+		: typecallocn(char, (unsigned) ch->allocated));
 
     if (ch->data == NULL)
 	outofmem(__FILE__, "HTChunkEnsure");
@@ -178,7 +182,7 @@ void HTChunkPutb(HTChunk *ch, const char *b, int l)
 	if (!HTChunkRealloc(ch, growby))
 	    return;
     }
-    memcpy(ch->data + ch->size, b, l);
+    memcpy(ch->data + ch->size, b, (unsigned) l);
     ch->size += l;
 }
 
@@ -191,7 +195,7 @@ HTChunk *HTChunkPutb2(HTChunk *ch, const char *b, int l)
 	HTChunk *chunk;
 	int m = ch->allocated - ch->size;
 
-	memcpy(ch->data + ch->size, b, m);
+	memcpy(ch->data + ch->size, b, (unsigned) m);
 	ch->size += m;
 
 	chunk = HTChunkCreateMayFail(ch->growby, ch->failok);
@@ -199,7 +203,7 @@ HTChunk *HTChunkPutb2(HTChunk *ch, const char *b, int l)
 	HTChunkPutb(chunk, b + m, l - m);
 	return chunk;
     }
-    memcpy(ch->data + ch->size, b, l);
+    memcpy(ch->data + ch->size, b, (unsigned) l);
     ch->size += l;
     return ch;
 }
diff --git a/WWW/Library/Implementation/HTDOS.c b/WWW/Library/Implementation/HTDOS.c
index abf24dfb..69772043 100644
--- a/WWW/Library/Implementation/HTDOS.c
+++ b/WWW/Library/Implementation/HTDOS.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTDOS.c,v 1.35 2008/12/26 18:07:02 tom Exp $
+ * $LynxId: HTDOS.c,v 1.36 2009/01/03 01:58:39 tom Exp $
  *							DOS specific routines
  */
 
@@ -20,7 +20,7 @@
  */
 static char *copy_plus(char **result, const char *source)
 {
-    int length = strlen(source);
+    int length = (int) strlen(source);
     int extra = 10;
     int n;
 
@@ -69,7 +69,7 @@ const char *HTDOS_wwwName(const char *dosname)
     }
     *cp_url = '\0';
 
-    wwwname_len = strlen(wwwname);
+    wwwname_len = (int) strlen(wwwname);
     if (wwwname_len > 1)
 	cp_url--;		/* point last char */
 
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 5f508efc..e1d53c59 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.87 2009/01/01 16:53:31 tom Exp $
+ * $LynxId: HTFTP.c,v 1.88 2009/01/03 01:57:47 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -462,7 +462,7 @@ static int write_cmd(const char *cmd)
 	    }
 	}
 #endif /* NOT_ASCII */
-	status = NETWRITE(control->socket, cmd, (int) strlen(cmd));
+	status = NETWRITE(control->socket, cmd, (unsigned) strlen(cmd));
 	if (status < 0) {
 	    CTRACE((tfp,
 		    "HTFTP: Error %d sending command: closing socket %d\n",
@@ -1126,9 +1126,9 @@ static void reset_master_socket(void)
 
 static void set_master_socket(int value)
 {
-    have_socket = (value >= 0);
+    have_socket = (BOOLEAN) (value >= 0);
     if (have_socket)
-	master_socket = value;
+	master_socket = (unsigned) value;
 }
 
 /*	Close Master (listening) socket
@@ -1143,7 +1143,7 @@ static int close_master_socket(void)
     if (have_socket)
 	FD_CLR(master_socket, &open_sockets);
 
-    status = NETCLOSE(master_socket);
+    status = NETCLOSE((int) master_socket);
     CTRACE((tfp, "HTFTP: Closed master socket %u\n", master_socket));
 
     reset_master_socket();
@@ -1405,10 +1405,10 @@ static int get_listen_socket(void)
 
 #ifdef SOCKS
 	if (socks_flag)
-	    status = Rlisten(master_socket, 1);
+	    status = Rlisten((int) master_socket, 1);
 	else
 #endif /* SOCKS */
-	    status = listen(master_socket, 1);
+	    status = listen((int) master_socket, 1);
 	if (status < 0) {
 	    reset_master_socket();
 	    return HTInetStatus("listen");
@@ -1419,7 +1419,7 @@ static int get_listen_socket(void)
     if ((master_socket + 1) > num_sockets)
 	num_sockets = master_socket + 1;
 
-    return master_socket;	/* Good */
+    return (int) master_socket;	/* Good */
 
 }				/* get_listen_socket */
 
@@ -1600,7 +1600,7 @@ static void parse_eplf_line(char *line,
 	case 's':
 	    size = 0;
 	    while (*(++cp) && (*cp != ','))
-		size = (size * 10) + (*cp - '0');
+		size = (size * 10) + (unsigned long) (*cp - '0');
 	    info->size = size;
 	    break;
 	case 'm':
@@ -1637,7 +1637,7 @@ static void parse_ls_line(char *line,
     unsigned long base = 1;
     unsigned long size_num = 0;
 
-    for (i = strlen(line) - 1;
+    for (i = (int) strlen(line) - 1;
 	 (i > 13) && (!isspace(UCH(line[i])) || !is_ls_date(&line[i - 12]));
 	 i--) {
 	;			/* null body */
@@ -1657,7 +1657,7 @@ static void parse_ls_line(char *line,
     }
     j = i - 14;
     while (isdigit(UCH(line[j]))) {
-	size_num += (line[j] - '0') * base;
+	size_num += ((unsigned long) (line[j] - '0') * base);
 	base *= 10;
 	j--;
     }
@@ -1681,7 +1681,7 @@ static void parse_ls_line(char *line,
      * Next is the link-count.
      */
     next = 0;
-    entry->file_links = strtol(cp, &next, 10);
+    entry->file_links = (unsigned long) strtol(cp, &next, 10);
     if (next == 0 || *next != ' ') {
 	entry->file_links = 0;
 	next = cp;
@@ -1738,7 +1738,7 @@ static void parse_dls_line(char *line,
        79215    \0
      */
 
-    len = strlen(line);
+    len = (int) strlen(line);
     if (len == 0) {
 	FREE(*pspilledname);
 	entry_info->display = FALSE;
@@ -1783,7 +1783,7 @@ static void parse_dls_line(char *line,
 	    j--;
 	}
     }
-    entry_info->size = size_num;
+    entry_info->size = (unsigned long) size_num;
 
     cps = LYSkipBlanks(&line[23]);
     if (!strncmp(cps, "-> ", 3) && cps[3] != '\0' && cps[3] != ' ') {
@@ -1797,10 +1797,10 @@ static void parse_dls_line(char *line,
 
     LYTrimTrailing(line);
 
-    len = strlen(line);
+    len = (int) strlen(line);
     if (len == 0 && *pspilledname && **pspilledname) {
 	line = *pspilledname;
-	len = strlen(*pspilledname);
+	len = (int) strlen(*pspilledname);
     }
     if (len > 0 && line[len - 1] == '/') {
 	/*
@@ -1844,7 +1844,7 @@ static void parse_vms_dir_entry(char *line,
     /* Cast VMS non-README file and directory names to lowercase. */
     if (strstr(entry_info->filename, "READ") == NULL) {
 	LYLowerCase(entry_info->filename);
-	i = strlen(entry_info->filename);
+	i = (int) strlen(entry_info->filename);
     } else {
 	i = ((strstr(entry_info->filename, "READ") - entry_info->filename) + 4);
 	if (!strncmp(&entry_info->filename[i], "ME", 2)) {
@@ -1853,7 +1853,7 @@ static void parse_vms_dir_entry(char *line,
 		i++;
 	    }
 	} else if (!strncmp(&entry_info->filename[i], ".ME", 3)) {
-	    i = strlen(entry_info->filename);
+	    i = (int) strlen(entry_info->filename);
 	} else {
 	    i = 0;
 	}
@@ -1924,12 +1924,12 @@ static void parse_vms_dir_entry(char *line,
 	    cps--;
 	if (cps < cpd)
 	    *cpd = '\0';
-	entry_info->size = atoi(cps);
+	entry_info->size = (unsigned long) atol(cps);
 	cps = cpd + 1;
 	while (isdigit(UCH(*cps)))
 	    cps++;
 	*cps = '\0';
-	ialloc = atoi(cpd + 1);
+	ialloc = (unsigned) atoi(cpd + 1);
 	/* Check if used is in blocks or bytes */
 	if (entry_info->size <= ialloc)
 	    entry_info->size *= 512;
@@ -1943,7 +1943,7 @@ static void parse_vms_dir_entry(char *line,
 		cpd++;
 	    if (*cpd == '\0') {
 		/* Assume it's blocks */
-		entry_info->size = atoi(cps) * 512;
+		entry_info->size = ((unsigned long) atol(cps) * 512);
 		break;
 	    }
 	}
@@ -1988,7 +1988,7 @@ static void parse_ms_windows_dir_entry(char *line,
 	cpd = LYSkipNonBlanks(cps);
 	*cpd++ = '\0';
 	if (isdigit(UCH(*cps))) {
-	    entry_info->size = atoi(cps);
+	    entry_info->size = (unsigned long) atol(cps);
 	} else {
 	    StrAllocCopy(entry_info->type, ENTRY_IS_DIRECTORY);
 	}
@@ -2121,7 +2121,7 @@ static void parse_windows_nt_dir_entry(char *line,
 	cpd = LYSkipNonBlanks(cps);
 	*cpd = '\0';
 	if (isdigit(*cps)) {
-	    entry_info->size = atoi(cps);
+	    entry_info->size = atol(cps);
 	} else {
 	    StrAllocCopy(entry_info->type, ENTRY_IS_DIRECTORY);
 	}
@@ -2219,7 +2219,7 @@ static void parse_cms_dir_entry(char *line,
 	}
 	if (Records > 0 && RecordLength > 0) {
 	    /* Compute an approximate size. */
-	    entry_info->size = (Records * RecordLength);
+	    entry_info->size = ((unsigned long) Records * (unsigned long) RecordLength);
 	}
     }
 
@@ -2310,7 +2310,7 @@ static EntryInfo *parse_dir_entry(char *entry,
 	 */
 
 	if (*first) {
-	    len = strlen(entry);
+	    len = (int) strlen(entry);
 	    if (!len || entry[0] == ' ' ||
 		(len >= 24 && entry[23] != ' ') ||
 		(len < 24 && strchr(entry, ' '))) {
@@ -2362,7 +2362,7 @@ static EntryInfo *parse_dir_entry(char *entry,
 	/*
 	 * Interpret and edit LIST output from Unix server.
 	 */
-	len = strlen(entry);
+	len = (int) strlen(entry);
 	if (*first) {
 	    /* don't gettext() this -- incoming text: */
 	    if (!strcmp(entry, "can not access directory .")) {
@@ -2443,7 +2443,7 @@ static EntryInfo *parse_dir_entry(char *entry,
 	/*
 	 * Trim off VMS directory extensions.
 	 */
-	len = strlen(entry_info->filename);
+	len = (int) strlen(entry_info->filename);
 	if ((len > 4) && !strcmp(&entry_info->filename[len - 4], ".dir")) {
 	    entry_info->filename[len - 4] = '\0';
 	    StrAllocCopy(entry_info->type, ENTRY_IS_DIRECTORY);
@@ -2527,7 +2527,7 @@ static EntryInfo *parse_dir_entry(char *entry,
 	 * Directories identified by trailing "/" characters.
 	 */
 	StrAllocCopy(entry_info->filename, entry);
-	len = strlen(entry);
+	len = (int) strlen(entry);
 	if (entry[len - 1] == '/') {
 	    /*
 	     * It's a dir, remove / and mark it as such.
@@ -2751,7 +2751,7 @@ static char *FormatStr(char **bufp,
 
 static char *FormatNum(char **bufp,
 		       char *start,
-		       long value)
+		       unsigned long value)
 {
     char fmt[512];
 
@@ -2784,11 +2784,11 @@ static void LYListFmtParse(const char *fmtstr,
     char *start;
     char *str = NULL;
     char *buf = NULL;
-    BOOL is_directory = (data->file_mode != 0 &&
-			 (TOUPPER(data->file_mode[0]) == 'D'));
-    BOOL is_symlinked = (data->file_mode != 0 &&
-			 (TOUPPER(data->file_mode[0]) == 'L'));
-    BOOL remove_size = (is_directory || is_symlinked);
+    BOOL is_directory = (BOOL) (data->file_mode != 0 &&
+				(TOUPPER(data->file_mode[0]) == 'D'));
+    BOOL is_symlinked = (BOOL) (data->file_mode != 0 &&
+				(TOUPPER(data->file_mode[0]) == 'L'));
+    BOOL remove_size = (BOOL) (is_directory || is_symlinked);
 
     StrAllocCopy(str, fmtstr);
     s = str;
@@ -3384,7 +3384,7 @@ static int setup_connection(const char *name,
 		    status = HT_NO_CONNECTION;
 		    break;
 		}
-		passive_port = (p0 << 8) + p1;
+		passive_port = (PortNumber) ((p0 << 8) + p1);
 		sprintf(dst, "%d.%d.%d.%d", h0, h1, h2, h3);
 	    } else if (strcmp(p, "EPSV") == 0) {
 		char c0, c1, c2, c3;
@@ -3399,15 +3399,16 @@ static int setup_connection(const char *name,
 		}
 		for ( /*nothing */ ;
 		     *p && *p && *p != '(';
-		     p++)	/*) */
+		     p++) {	/*) */
 		    ;		/* null body */
+		}
 		status = sscanf(p, "(%c%c%c%d%c)", &c0, &c1, &c2, &p0, &c3);
 		if (status != 5) {
 		    fprintf(tfp, "HTFTP: EPSV reply has invalid format!\n");
 		    status = HT_NO_CONNECTION;
 		    break;
 		}
-		passive_port = p0;
+		passive_port = (PortNumber) p0;
 
 		sslen = sizeof(ss);
 		if (getpeername(control->socket, (struct sockaddr *) &ss,
@@ -4024,12 +4025,12 @@ int HTFTPLoad(const char *name,
 
 #ifdef SOCKS
 	if (socks_flag)
-	    status = Raccept(master_socket,
+	    status = Raccept((int) master_socket,
 			     (struct sockaddr *) &soc_address,
 			     &soc_addrlen);
 	else
 #endif /* SOCKS */
-	    status = accept(master_socket,
+	    status = accept((int) master_socket,
 			    (struct sockaddr *) &soc_address,
 			    &soc_addrlen);
 	if (status < 0) {
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index e98077c3..53184d47 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.117 2009/01/01 16:47:58 tom Exp $
+ * $LynxId: HTFile.c,v 1.118 2009/01/02 23:03:34 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -1882,7 +1882,6 @@ static int print_local_dir(DIR *dp, char *localname,
     BOOL need_parent_link = FALSE;
     BOOL preformatted = FALSE;
     int status;
-    int i;
     struct stat *actual_info;
 
 #ifdef DISP_PARTIAL
diff --git a/WWW/Library/Implementation/HTFinger.c b/WWW/Library/Implementation/HTFinger.c
index 7afb64b9..5567ed1d 100644
--- a/WWW/Library/Implementation/HTFinger.c
+++ b/WWW/Library/Implementation/HTFinger.c
@@ -1,4 +1,7 @@
-/*			FINGER ACCESS				HTFinger.c
+/*
+ * $LynxId: HTFinger.c,v 1.25 2009/01/03 02:02:18 tom Exp $
+ *
+ *			FINGER ACCESS				HTFinger.c
  *			=============
  * Authors:
  *  ARB  Andrew Brooks
@@ -110,7 +113,7 @@ static int response(char *command,
 		    HTStream *sink)
 {
     int status;
-    int length = strlen(command);
+    int length = (int) strlen(command);
     int ch, i;
     char line[BIG], *l, *cmd = NULL;
     char *p = line, *href = NULL;
@@ -125,7 +128,7 @@ static int response(char *command,
     /* Send the command.
      */
     CTRACE((tfp, "HTFinger command to be sent: %s", command));
-    status = NETWRITE(finger_fd, (char *) command, length);
+    status = NETWRITE(finger_fd, (char *) command, (unsigned) length);
     if (status < 0) {
 	CTRACE((tfp, "HTFinger: Unable to send command. Disconnecting.\n"));
 	NETCLOSE(finger_fd);
@@ -165,7 +168,7 @@ static int response(char *command,
     } else {
 	StrAllocCopy(cmd, "");
     }
-    for (i = (strlen(cmd) - 1); i >= 0; i--) {
+    for (i = ((int) strlen(cmd) - 1); i >= 0; i--) {
 	if (cmd[i] == LF || cmd[i] == CR) {
 	    cmd[i] = '\0';
 	} else {
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 844cf6e0..d6e8e883 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.68 2009/01/01 16:50:17 tom Exp $
+ * $LynxId: HTMIME.c,v 1.69 2009/01/02 23:04:02 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -791,7 +791,7 @@ static int dispatchField(HTStream *me)
 	me->anchor->content_length = atoi(me->value);
 	if (me->anchor->content_length < 0)
 	    me->anchor->content_length = 0;
-	CTRACE((tfp, "        Converted to integer: '%d'\n",
+	CTRACE((tfp, "        Converted to integer: '%ld'\n",
 		me->anchor->content_length));
 	break;
     case miCONTENT_LOCATION:
diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index 00c79499..98882782 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -1,4 +1,7 @@
-/*		HTML Generator
+/*
+ * $LynxId: HTMLGen.c,v 1.28 2009/01/03 01:27:53 tom Exp $
+ *
+ *		HTML Generator
  *		==============
  *
  *	This version of the HTML object sends HTML markup to the output stream.
@@ -331,7 +334,7 @@ static int HTMLGen_start_element(HTStructured * me, int element_number,
 	HTSprintf(&Style_className, ";%s", HTML_dtd.tags[element_number].name);
 	strcpy(myHash, HTML_dtd.tags[element_number].name);
 	if (class_string[0]) {
-	    int len = strlen(myHash);
+	    int len = (int) strlen(myHash);
 
 	    sprintf(myHash + len, ".%.*s", (int) sizeof(myHash) - len - 2, class_string);
 	    HTSprintf(&Style_className, ".%s", class_string);
@@ -464,7 +467,9 @@ static int HTMLGen_start_element(HTStructured * me, int element_number,
     /*
      * Make very specific HTML assumption that PRE can't be nested!
      */
-    me->preformatted = (element_number == HTML_PRE) ? YES : was_preformatted;
+    me->preformatted = (BOOL) ((element_number == HTML_PRE)
+			       ? YES
+			       : was_preformatted);
 
     /*
      * Can break after element start.
@@ -561,7 +566,7 @@ static int HTMLGen_end_element(HTStructured * me, int element_number,
  */
 static int HTMLGen_put_entity(HTStructured * me, int entity_number)
 {
-    int nent = HTML_dtd.number_of_entities;
+    int nent = (int) HTML_dtd.number_of_entities;
 
     HTMLGen_put_character(me, '&');
     if (entity_number < nent) {
diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c
index 33a4154a..c9bfbbf0 100644
--- a/WWW/Library/Implementation/HTParse.c
+++ b/WWW/Library/Implementation/HTParse.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTParse.c,v 1.50 2008/12/14 15:38:54 tom Exp $
+ * $LynxId: HTParse.c,v 1.51 2009/01/03 01:11:14 tom Exp $
  *
  *		Parse HyperText Document Address		HTParse.c
  *		================================
@@ -426,7 +426,7 @@ char *HTParse(const char *aName,
 			*p2 = '\0';	/* It is the default: ignore it */
 		}
 		if (p2 == NULL) {
-		    int len3 = strlen(tail);
+		    int len3 = (int) strlen(tail);
 
 		    if (len3 > 0) {
 			h = tail + len3 - 1;	/* last char of hostname */
@@ -666,14 +666,17 @@ const char *HTParseAnchor(const char *aName)
 {
     const char *p = aName;
 
-    for (; *p && *p != '#'; p++) ;
+    for (; *p && *p != '#'; p++) {
+	;
+    }
     if (*p == '#') {
 	/* the safe way based on HTParse() -
 	 * keeping in mind scan() peculiarities on schemes:
 	 */
 	struct struct_parts given;
 
-	char *name = (char *) LYalloca((p - aName) + strlen(p) + 1);
+	char *name = (char *) LYalloca((unsigned) ((p - aName)
+						   + (int) strlen(p) + 1));
 
 	if (name == NULL) {
 	    outofmem(__FILE__, "HTParseAnchor");
@@ -887,7 +890,7 @@ char *HTRelative(const char *aName,
     } else if (slashes == 3) {	/* Same node, different path */
 	StrAllocCopy(result, path);
     } else {			/* Some path in common */
-	int levels = 0;
+	unsigned levels = 0;
 
 	for (; *q && (*q != '#'); q++)
 	    if (*q == '/')
@@ -907,6 +910,9 @@ char *HTRelative(const char *aName,
     return result;
 }
 
+#define AlloCopy(next,base,extra) \
+	typecallocn(char, (unsigned) ((next - base) + ((int) extra)))
+
 /*	Escape undesirable characters using %			HTEscape()
  *	-------------------------------------
  *
@@ -948,12 +954,12 @@ char *HTEscape(const char *str,
     for (p = str; *p; p++)
 	if (!ACCEPTABLE(UCH(TOASCII(*p))))
 	    unacceptable++;
-    result = typecallocn(char, (p - str) + (unacceptable * 2) + 1);
+    result = AlloCopy(p, str, (unacceptable * 2) + 1);
 
     if (result == NULL)
 	outofmem(__FILE__, "HTEscape");
     for (q = result, p = str; *p; p++) {
-	unsigned char a = TOASCII(*p);
+	unsigned char a = UCH(TOASCII(*p));
 
 	if (!ACCEPTABLE(a)) {
 	    *q++ = HEX_ESCAPE;	/* Means hex coming */
@@ -988,12 +994,12 @@ char *HTEscapeUnsafe(const char *str)
     for (p = str; *p; p++)
 	if (UNSAFE(UCH(TOASCII(*p))))
 	    unacceptable++;
-    result = typecallocn(char, (p - str) + (unacceptable * 2) + 1);
+    result = AlloCopy(p, str, (unacceptable * 2) + 1);
 
     if (result == NULL)
 	outofmem(__FILE__, "HTEscapeUnsafe");
     for (q = result, p = str; *p; p++) {
-	unsigned char a = TOASCII(*p);
+	unsigned char a = UCH(TOASCII(*p));
 
 	if (UNSAFE(a)) {
 	    *q++ = HEX_ESCAPE;	/* Means hex coming */
@@ -1028,12 +1034,12 @@ char *HTEscapeSP(const char *str,
     for (p = str; *p; p++)
 	if (!(*p == ' ' || ACCEPTABLE(UCH(TOASCII(*p)))))
 	    unacceptable++;
-    result = typecallocn(char, (p - str) + (unacceptable * 2) + 1);
+    result = AlloCopy(p, str, (unacceptable * 2) + 1);
 
     if (result == NULL)
 	outofmem(__FILE__, "HTEscape");
     for (q = result, p = str; *p; p++) {
-	unsigned char a = TOASCII(*p);
+	unsigned char a = UCH(TOASCII(*p));
 
 	if (a == 32) {
 	    *q++ = '+';
@@ -1181,7 +1187,7 @@ void HTMake822Word(char **str,
 	return;
     }
     for (p = *str; *p; p++) {
-	a = TOASCII(*p);	/* S/390 -- gil -- 0240 */
+	a = UCH(TOASCII(*p));	/* S/390 -- gil -- 0240 */
 	if (a < 32 || a >= 128 ||
 	    ((crfc[a - 32]) & 1)) {
 	    if (!added)
@@ -1196,7 +1202,7 @@ void HTMake822Word(char **str,
     }
     if (!added)
 	return;
-    result = typecallocn(char, p - (*str) + added + 1);
+    result = AlloCopy(p, *str, added + 1);
     if (result == NULL)
 	outofmem(__FILE__, "HTMake822Word");
 
@@ -1211,7 +1217,7 @@ void HTMake822Word(char **str,
      */
     /* S/390 -- gil -- 0268 */
     for (p = *str; *p; p++) {
-	a = TOASCII(*p);
+	a = UCH(TOASCII(*p));
 	if ((a != ASCII_TAB) &&
 	    ((a & 127) < ASCII_SPC ||
 	     (a < 128 && ((crfc[a - 32]) & 2))))
diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c
index 8dfa901e..c3b66861 100644
--- a/WWW/Library/Implementation/HTPlain.c
+++ b/WWW/Library/Implementation/HTPlain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTPlain.c,v 1.42 2008/09/06 14:45:09 tom Exp $
+ * $LynxId: HTPlain.c,v 1.44 2009/01/03 01:23:21 tom Exp $
  *
  *		Plain text object		HTWrite.c
  *		=================
@@ -159,13 +159,13 @@ static void HTPlain_put_character(HTStream *me, char c)
 	    UCode_t value = (UCode_t) FROMASCII((TOASCII(UCH(c)) - 160));
 
 	    name = HTMLGetEntityName(value);
-	    len = strlen(name);
-	    for (low = 0, high = HTML_dtd.number_of_entities;
+	    len = (int) strlen(name);
+	    for (low = 0, high = (int) HTML_dtd.number_of_entities;
 		 high > low;
 		 diff < 0 ? (low = i + 1) : (high = i)) {
 		/* Binary search */
 		i = (low + (high - low) / 2);
-		diff = AS_ncmp(HTML_dtd.entity_names[i], name, len);
+		diff = AS_ncmp(HTML_dtd.entity_names[i], name, (unsigned) len);
 		if (diff == 0) {
 		    HText_appendText(me->text,
 				     LYCharSets[me->outUCLYhndl][i]);
@@ -572,7 +572,7 @@ static void HTPlain_write(HTStream *me, const char *s, int l)
 		 * Out of luck, so use the UHHH notation (ugh).  - gil
 		 */
 		/* S/390 -- gil -- 0517 */
-		sprintf(replace_buf, "U%.2lX", TOASCII(code));
+		sprintf(replace_buf, "U%.2lX", (unsigned long) TOASCII(code));
 		HText_appendText(me->text, replace_buf);
 	    }
 #ifdef NOTDEFINED
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 47c8307a..c13d686d 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.103 2009/01/01 16:40:54 tom Exp $
+ * $LynxId: HTTP.c,v 1.104 2009/01/03 01:41:51 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -173,7 +173,7 @@ void HTSSLInitPRNG(void)
 	/* Initialize system's random number generator */
 	RAND_bytes((unsigned char *) &seed, sizeof(long));
 
-	lynx_srand(seed);
+	lynx_srand((unsigned) seed);
 	while (RAND_status() == 0) {
 	    /* Repeatedly seed the PRNG using the system's random number generator until it has been seeded with enough data */
 	    l = lynx_rand();
@@ -444,7 +444,7 @@ static BOOL acceptEncoding(int code)
 	 * FIXME:  if lynx did not rely upon external programs to decompress
 	 * files for external viewers, this check could be relaxed.
 	 */
-	result = (program != 0);
+	result = (BOOL) (program != 0);
     }
     return result;
 }
@@ -894,7 +894,7 @@ static int HTLoadHTTP(const char *arg,
 			cert_host = (char *) ASN1_STRING_data(gn->d.ia5);
 		    else if (gn->type == GEN_IPADD) {
 			/* XXX untested -TG */
-			size_t j = ASN1_STRING_length(gn->d.ia5);
+			size_t j = (size_t) ASN1_STRING_length(gn->d.ia5);
 
 			cert_host = (char *) malloc(j + 1);
 			memcpy(cert_host, ASN1_STRING_data(gn->d.ia5), j);
@@ -1059,13 +1059,13 @@ static int HTLoadHTTP(const char *arg,
 			    "Accept: " : ", "),
 			   HTAtom_name(pres->rep),
 			   temp);
-		len += strlen(linebuf);
+		len += (int) strlen(linebuf);
 		if (len > 252 && !first_Accept) {
 		    BStrCat0(command, crlf);
 		    HTSprintf0(&linebuf, "Accept: %s%s",
 			       HTAtom_name(pres->rep),
 			       temp);
-		    len = strlen(linebuf);
+		    len = (int) strlen(linebuf);
 		}
 		BStrCat0(command, linebuf);
 		first_Accept = FALSE;
@@ -1485,7 +1485,7 @@ static int HTLoadHTTP(const char *arg,
 	BOOL end_of_file = NO;
 	int buffer_length = INIT_LINE_SIZE;
 
-	line_buffer = typecallocn(char, buffer_length);
+	line_buffer = typecallocn(char, (unsigned) buffer_length);
 
 	if (line_buffer == NULL)
 	    outofmem(__FILE__, "HTLoadHTTP");
@@ -1498,14 +1498,17 @@ static int HTLoadHTTP(const char *arg,
 	    if (buffer_length - length < LINE_EXTEND_THRESH) {
 		buffer_length = buffer_length + buffer_length;
 		line_buffer =
-		    (char *) realloc(line_buffer, (buffer_length * sizeof(char)));
+		    (char *) realloc(line_buffer, ((unsigned) buffer_length *
+						   sizeof(char)));
 
 		if (line_buffer == NULL)
 		    outofmem(__FILE__, "HTLoadHTTP");
 	    }
 	    CTRACE((tfp, "HTTP: Trying to read %d\n", buffer_length - length - 1));
-	    status = HTTP_NETREAD(s, line_buffer + length,
-				  buffer_length - length - 1, handle);
+	    status = HTTP_NETREAD(s,
+				  line_buffer + length,
+				  (buffer_length - length - 1),
+				  handle);
 	    CTRACE((tfp, "HTTP: Read %d\n", status));
 	    if (status <= 0) {
 		/*
@@ -1576,11 +1579,12 @@ static int HTLoadHTTP(const char *arg,
 
 	    if (line_buffer) {
 		FREE(line_kept_clean);
-		line_kept_clean = (char *) malloc(buffer_length * sizeof(char));
+		line_kept_clean = (char *) malloc((unsigned) buffer_length *
+						  sizeof(char));
 
 		if (line_kept_clean == NULL)
 		    outofmem(__FILE__, "HTLoadHTTP");
-		memcpy(line_kept_clean, line_buffer, buffer_length);
+		memcpy(line_kept_clean, line_buffer, (unsigned) buffer_length);
 		real_length_of_line = length + status;
 	    }
 
diff --git a/WWW/Library/Implementation/HTWSRC.c b/WWW/Library/Implementation/HTWSRC.c
index 3916bd86..252627b3 100644
--- a/WWW/Library/Implementation/HTWSRC.c
+++ b/WWW/Library/Implementation/HTWSRC.c
@@ -1,4 +1,7 @@
-/*			Parse WAIS Source file			HTWSRC.c
+/*
+ * $LynxId: HTWSRC.c,v 1.24 2009/01/03 02:01:01 tom Exp $
+ *
+ *			Parse WAIS Source file			HTWSRC.c
  *			======================
  *
  *	This module parses a stream with WAIS source file
@@ -307,7 +310,7 @@ static void WSRC_gen_html(HTStream *me, BOOL source_file)
 	int l;
 
 	StrAllocCopy(shortname, me->par_value[PAR_DATABASE_NAME]);
-	l = strlen(shortname);
+	l = (int) strlen(shortname);
 	if (l > 4 && !strcasecomp(shortname + l - 4, ".src")) {
 	    shortname[l - 4] = 0;	/* Chop of .src -- boring! */
 	}
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 1c851824..709586e5 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.119 2008/12/31 20:19:38 tom Exp $
+ * $LynxId: SGML.c,v 1.120 2009/01/03 01:12:28 tom Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -80,7 +80,7 @@ static void fake_put_character(void *p GCC_UNUSED,
     }
 
 #define PUTS(str) ((*context->actions->put_string)(context->target, str))
-#define PUTC(ch)  ((*context->actions->put_character)(context->target, ch))
+#define PUTC(ch)  ((*context->actions->put_character)(context->target, (char) ch))
 #define PUTUTF8(code) (UCPutUtf8_charstring((HTStream *)context->target, \
 		      (putc_func_t*)(context->actions->put_character), code))
 
diff --git a/aclocal.m4 b/aclocal.m4
index d8900821..f321d6f7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,11 @@
-dnl $LynxId: aclocal.m4,v 1.134 2009/01/02 01:46:18 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.135 2009/01/03 16:20:40 tom Exp $
 dnl Macros for auto-configure script.
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/1/28
-dnl Updated: 2009/1/1
+dnl Updated: 2009/1/3
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
 dnl by Thomas Dickey.  See your local GNU archives, and this URL:
@@ -1515,6 +1515,30 @@ if test $cf_cv_color_curses = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CHTYPE version: 6 updated: 2003/11/06 19:59:57
+dnl ----------------
+dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses).
+AC_DEFUN([CF_CURSES_CHTYPE],
+[
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+AC_CACHE_CHECK(for chtype typedef,cf_cv_chtype_decl,[
+	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+		[chtype foo],
+		[cf_cv_chtype_decl=yes],
+		[cf_cv_chtype_decl=no])])
+if test $cf_cv_chtype_decl = yes ; then
+	AC_DEFINE(HAVE_TYPE_CHTYPE)
+	AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[
+		AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+			[chtype foo; long x = foo],
+			[cf_cv_chtype_type=scalar],
+			[cf_cv_chtype_type=struct])])
+	if test $cf_cv_chtype_type = scalar ; then
+		AC_DEFINE(TYPE_CHTYPE_IS_SCALAR)
+	fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27
 dnl ----------------
 dnl Tie together the configure-script macros for curses.  It may be ncurses,
diff --git a/config.hin b/config.hin
index b213d928..9592a085 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.110 2008/12/31 21:02:35 tom Exp $
+ * $LynxId: config.hin,v 1.111 2009/01/03 16:02:07 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -151,6 +151,7 @@
 #undef HAVE_TRUNCATE
 #undef HAVE_TTYNAME
 #undef HAVE_TTYTYPE
+#undef HAVE_TYPE_CHTYPE		/* CF_CURSES_CHTYPE */
 #undef HAVE_TYPE_UNIONWAIT	/* CF_UNION_WAIT */
 #undef HAVE_UNISTD_H		/* have <unistd.h> */
 #undef HAVE_UNSETENV
diff --git a/configure b/configure
index 9ea5c9d8..d800a893 100755
--- a/configure
+++ b/configure
@@ -21198,7 +21198,100 @@ EOF
 	;;
 esac
 
-echo "$as_me:21201: checking if you want the wide-curses features" >&5
+echo "$as_me:21201: 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 21208 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header-curses.h}>
+int
+main ()
+{
+chtype foo
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:21220: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:21223: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:21226: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21229: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_chtype_decl=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_chtype_decl=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:21239: result: $cf_cv_chtype_decl" >&5
+echo "${ECHO_T}$cf_cv_chtype_decl" >&6
+if test $cf_cv_chtype_decl = yes ; then
+	cat >>confdefs.h <<\EOF
+#define HAVE_TYPE_CHTYPE 1
+EOF
+
+	echo "$as_me:21246: 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 21253 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header-curses.h}>
+int
+main ()
+{
+chtype foo; long x = foo
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:21265: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:21268: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:21271: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21274: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_chtype_type=scalar
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_chtype_type=struct
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:21284: result: $cf_cv_chtype_type" >&5
+echo "${ECHO_T}$cf_cv_chtype_type" >&6
+	if test $cf_cv_chtype_type = scalar ; then
+		cat >>confdefs.h <<\EOF
+#define TYPE_CHTYPE_IS_SCALAR 1
+EOF
+
+	fi
+fi
+
+echo "$as_me:21294: 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.
@@ -21215,10 +21308,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:21218: result: $use_wide_curses" >&5
+echo "$as_me:21311: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:21221: checking if color-style code should be used" >&5
+echo "$as_me:21314: 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.
@@ -21238,7 +21331,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:21241: result: no" >&5
+	echo "$as_me:21334: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -21247,10 +21340,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:21250: result: yes" >&5
+	echo "$as_me:21343: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:21253: checking for location of style-sheet file" >&5
+	echo "$as_me:21346: 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.
@@ -21286,7 +21379,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:21289: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:21382: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -21295,7 +21388,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:21298: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:21391: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -21307,7 +21400,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21310: checking for the default configuration-file" >&5
+echo "$as_me:21403: 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.
@@ -21343,7 +21436,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:21346: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:21439: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -21352,7 +21445,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:21355: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:21448: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -21360,7 +21453,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:21363: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:21456: 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.
@@ -21377,7 +21470,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:21380: result: $use_htmlized_cfg" >&5
+echo "$as_me:21473: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -21385,7 +21478,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:21388: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:21481: 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.
@@ -21402,7 +21495,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:21405: result: $use_local_docs" >&5
+echo "$as_me:21498: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -21410,7 +21503,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:21413: checking for MIME library directory" >&5
+echo "$as_me:21506: 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.
@@ -21446,7 +21539,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:21449: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:21542: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -21455,14 +21548,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:21458: result: $MIME_LIBDIR" >&5
+echo "$as_me:21551: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:21465: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:21558: 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.
@@ -21479,7 +21572,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:21482: result: $use_locale_charset" >&5
+echo "$as_me:21575: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
@@ -21487,7 +21580,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:21490: checking if you want only a few charsets" >&5
+echo "$as_me:21583: 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.
@@ -21499,7 +21592,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:21502: result: yes" >&5
+	echo "$as_me:21595: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -21512,7 +21605,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}:21515: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me-configure}:21608: 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'`
@@ -21539,28 +21632,28 @@ echo "${as_me-configure}:21515: testing using minimal list of charsets: $cf_min_
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me-configure}:21542: testing found $cf_charset ..." 1>&5
+echo "${as_me-configure}:21635: 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}:21548: testing not found $cf_charset ..." 1>&5
+echo "${as_me-configure}:21641: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:21553: result: no" >&5
+	echo "$as_me:21646: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:21557: checking for ANSI C header files" >&5
+echo "$as_me:21650: 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 21563 "configure"
+#line 21656 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -21568,13 +21661,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:21571: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21664: \"$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:21577: \$? = $ac_status" >&5
+  echo "$as_me:21670: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21596,7 +21689,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 21599 "configure"
+#line 21692 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -21614,7 +21707,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 21617 "configure"
+#line 21710 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -21635,7 +21728,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21638 "configure"
+#line 21731 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -21661,15 +21754,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21757: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21667: \$? = $ac_status" >&5
+  echo "$as_me:21760: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21672: \$? = $ac_status" >&5
+  echo "$as_me:21765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21682,7 +21775,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:21685: result: $ac_cv_header_stdc" >&5
+echo "$as_me:21778: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -21692,13 +21785,13 @@ EOF
 
 fi
 
-echo "$as_me:21695: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:21788: 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 21701 "configure"
+#line 21794 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -21714,16 +21807,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21720: \$? = $ac_status" >&5
+  echo "$as_me:21813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21726: \$? = $ac_status" >&5
+  echo "$as_me:21819: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -21733,7 +21826,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21736: result: $ac_cv_header_time" >&5
+echo "$as_me:21829: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -21746,13 +21839,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:21749: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:21842: 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 21755 "configure"
+#line 21848 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -21767,16 +21860,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21773: \$? = $ac_status" >&5
+  echo "$as_me:21866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21779: \$? = $ac_status" >&5
+  echo "$as_me:21872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -21786,7 +21879,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21789: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21882: 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
@@ -21799,7 +21892,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:21802: checking for opendir in -ldir" >&5
+  echo "$as_me:21895: 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
@@ -21807,7 +21900,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21810 "configure"
+#line 21903 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21826,16 +21919,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21832: \$? = $ac_status" >&5
+  echo "$as_me:21925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21838: \$? = $ac_status" >&5
+  echo "$as_me:21931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -21846,14 +21939,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21849: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:21942: 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:21856: checking for opendir in -lx" >&5
+  echo "$as_me:21949: 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
@@ -21861,7 +21954,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21864 "configure"
+#line 21957 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21880,16 +21973,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21886: \$? = $ac_status" >&5
+  echo "$as_me:21979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21892: \$? = $ac_status" >&5
+  echo "$as_me:21985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -21900,7 +21993,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21903: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:21996: 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"
@@ -21928,23 +22021,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21931: checking for $ac_header" >&5
+echo "$as_me:22024: 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 21937 "configure"
+#line 22030 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21941: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22034: \"$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:21947: \$? = $ac_status" >&5
+  echo "$as_me:22040: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21963,7 +22056,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21966: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22059: 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
@@ -21973,14 +22066,14 @@ EOF
 fi
 done
 
-echo "$as_me:21976: checking termio.h and termios.h" >&5
+echo "$as_me:22069: 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 21983 "configure"
+#line 22076 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -21998,16 +22091,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22004: \$? = $ac_status" >&5
+  echo "$as_me:22097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22010: \$? = $ac_status" >&5
+  echo "$as_me:22103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -22018,20 +22111,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:22021: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:22114: 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:22027: checking for sigaction and structs" >&5
+echo "$as_me:22120: 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 22034 "configure"
+#line 22127 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22051,16 +22144,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22057: \$? = $ac_status" >&5
+  echo "$as_me:22150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22063: \$? = $ac_status" >&5
+  echo "$as_me:22156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -22071,7 +22164,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:22074: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:22167: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -22080,23 +22173,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:22083: checking for $ac_header" >&5
+echo "$as_me:22176: 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 22089 "configure"
+#line 22182 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22093: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22186: \"$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:22099: \$? = $ac_status" >&5
+  echo "$as_me:22192: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22115,7 +22208,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22118: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22211: 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
@@ -22136,23 +22229,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22139: checking for $ac_header" >&5
+echo "$as_me:22232: 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 22145 "configure"
+#line 22238 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22149: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22242: \"$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:22155: \$? = $ac_status" >&5
+  echo "$as_me:22248: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22171,7 +22264,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22174: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22267: 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
@@ -22184,23 +22277,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22187: checking for $ac_header" >&5
+echo "$as_me:22280: 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 22193 "configure"
+#line 22286 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22197: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22290: \"$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:22203: \$? = $ac_status" >&5
+  echo "$as_me:22296: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22219,7 +22312,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22222: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22315: 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
@@ -22241,14 +22334,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:22244: checking for union wait" >&5
+echo "$as_me:22337: 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 22251 "configure"
+#line 22344 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22264,16 +22357,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22270: \$? = $ac_status" >&5
+  echo "$as_me:22363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22276: \$? = $ac_status" >&5
+  echo "$as_me:22369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -22283,7 +22376,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22286 "configure"
+#line 22379 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22303,16 +22396,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22309: \$? = $ac_status" >&5
+  echo "$as_me:22402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22315: \$? = $ac_status" >&5
+  echo "$as_me:22408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -22327,7 +22420,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:22330: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:22423: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -22335,14 +22428,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:22338: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:22431: 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 22345 "configure"
+#line 22438 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22354,16 +22447,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22360: \$? = $ac_status" >&5
+  echo "$as_me:22453: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22366: \$? = $ac_status" >&5
+  echo "$as_me:22459: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -22375,20 +22468,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:22378: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:22471: 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:22384: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:22477: 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 22391 "configure"
+#line 22484 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22400,16 +22493,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22406: \$? = $ac_status" >&5
+  echo "$as_me:22499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22412: \$? = $ac_status" >&5
+  echo "$as_me:22505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -22421,7 +22514,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:22424: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:22517: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -22429,13 +22522,13 @@ EOF
 
 fi
 
-echo "$as_me:22432: checking for uid_t in sys/types.h" >&5
+echo "$as_me:22525: 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 22438 "configure"
+#line 22531 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -22449,7 +22542,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:22452: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:22545: 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
 
@@ -22463,7 +22556,7 @@ EOF
 
 fi
 
-echo "$as_me:22466: checking type of array argument to getgroups" >&5
+echo "$as_me:22559: 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
@@ -22472,7 +22565,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22475 "configure"
+#line 22568 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -22498,15 +22591,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22504: \$? = $ac_status" >&5
+  echo "$as_me:22597: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22509: \$? = $ac_status" >&5
+  echo "$as_me:22602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -22519,7 +22612,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 22522 "configure"
+#line 22615 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -22534,20 +22627,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:22537: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:22630: 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:22544: checking for off_t" >&5
+echo "$as_me:22637: 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 22550 "configure"
+#line 22643 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22562,16 +22655,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22565: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22568: \$? = $ac_status" >&5
+  echo "$as_me:22661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22574: \$? = $ac_status" >&5
+  echo "$as_me:22667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -22581,7 +22674,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22584: result: $ac_cv_type_off_t" >&5
+echo "$as_me:22677: 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
   :
@@ -22593,13 +22686,13 @@ EOF
 
 fi
 
-echo "$as_me:22596: checking for pid_t" >&5
+echo "$as_me:22689: 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 22602 "configure"
+#line 22695 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22614,16 +22707,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22617: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22620: \$? = $ac_status" >&5
+  echo "$as_me:22713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22626: \$? = $ac_status" >&5
+  echo "$as_me:22719: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -22633,7 +22726,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22636: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:22729: 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
   :
@@ -22645,13 +22738,13 @@ EOF
 
 fi
 
-echo "$as_me:22648: checking for uid_t in sys/types.h" >&5
+echo "$as_me:22741: 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 22654 "configure"
+#line 22747 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -22665,7 +22758,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:22668: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:22761: 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
 
@@ -22679,13 +22772,13 @@ EOF
 
 fi
 
-echo "$as_me:22682: checking for mode_t" >&5
+echo "$as_me:22775: 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 22688 "configure"
+#line 22781 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22700,16 +22793,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22796: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22706: \$? = $ac_status" >&5
+  echo "$as_me:22799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22712: \$? = $ac_status" >&5
+  echo "$as_me:22805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -22719,7 +22812,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22722: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:22815: 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
   :
@@ -22731,13 +22824,13 @@ EOF
 
 fi
 
-	echo "$as_me:22734: checking for socklen_t" >&5
+	echo "$as_me:22827: 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 22740 "configure"
+#line 22833 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 
@@ -22753,16 +22846,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22759: \$? = $ac_status" >&5
+  echo "$as_me:22852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22765: \$? = $ac_status" >&5
+  echo "$as_me:22858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -22772,7 +22865,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22775: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:22868: 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
@@ -22787,14 +22880,14 @@ EOF
 
 fi
 
-echo "$as_me:22790: checking for tm.tm_gmtoff" >&5
+echo "$as_me:22883: 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 22797 "configure"
+#line 22890 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -22819,16 +22912,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22915: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22825: \$? = $ac_status" >&5
+  echo "$as_me:22918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22831: \$? = $ac_status" >&5
+  echo "$as_me:22924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -22839,19 +22932,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:22842: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:22935: 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:22848: checking for int" >&5
+echo "$as_me:22941: 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 22854 "configure"
+#line 22947 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22866,16 +22959,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22869: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22872: \$? = $ac_status" >&5
+  echo "$as_me:22965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22878: \$? = $ac_status" >&5
+  echo "$as_me:22971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -22885,10 +22978,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22888: result: $ac_cv_type_int" >&5
+echo "$as_me:22981: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:22891: checking size of int" >&5
+echo "$as_me:22984: 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
@@ -22897,7 +22990,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 22900 "configure"
+#line 22993 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22909,21 +23002,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22915: \$? = $ac_status" >&5
+  echo "$as_me:23008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22921: \$? = $ac_status" >&5
+  echo "$as_me:23014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22926 "configure"
+#line 23019 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22935,16 +23028,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22938: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22941: \$? = $ac_status" >&5
+  echo "$as_me:23034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22947: \$? = $ac_status" >&5
+  echo "$as_me:23040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -22960,7 +23053,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22963 "configure"
+#line 23056 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22972,16 +23065,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22978: \$? = $ac_status" >&5
+  echo "$as_me:23071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22984: \$? = $ac_status" >&5
+  echo "$as_me:23077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -22997,7 +23090,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 23000 "configure"
+#line 23093 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23009,16 +23102,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23015: \$? = $ac_status" >&5
+  echo "$as_me:23108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23021: \$? = $ac_status" >&5
+  echo "$as_me:23114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23031,12 +23124,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23034: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23127: 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 23039 "configure"
+#line 23132 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23052,15 +23145,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23058: \$? = $ac_status" >&5
+  echo "$as_me:23151: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23063: \$? = $ac_status" >&5
+  echo "$as_me:23156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -23076,19 +23169,19 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:23079: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:23172: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 EOF
 
-echo "$as_me:23085: checking for long" >&5
+echo "$as_me:23178: 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 23091 "configure"
+#line 23184 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23103,16 +23196,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23109: \$? = $ac_status" >&5
+  echo "$as_me:23202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23115: \$? = $ac_status" >&5
+  echo "$as_me:23208: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -23122,10 +23215,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23125: result: $ac_cv_type_long" >&5
+echo "$as_me:23218: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:23128: checking size of long" >&5
+echo "$as_me:23221: 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
@@ -23134,7 +23227,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 23137 "configure"
+#line 23230 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23146,21 +23239,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23149: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23152: \$? = $ac_status" >&5
+  echo "$as_me:23245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23158: \$? = $ac_status" >&5
+  echo "$as_me:23251: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23163 "configure"
+#line 23256 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23172,16 +23265,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23178: \$? = $ac_status" >&5
+  echo "$as_me:23271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23184: \$? = $ac_status" >&5
+  echo "$as_me:23277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -23197,7 +23290,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23200 "configure"
+#line 23293 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23209,16 +23302,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23215: \$? = $ac_status" >&5
+  echo "$as_me:23308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23221: \$? = $ac_status" >&5
+  echo "$as_me:23314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -23234,7 +23327,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 23237 "configure"
+#line 23330 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23246,16 +23339,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23252: \$? = $ac_status" >&5
+  echo "$as_me:23345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23258: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23268,12 +23361,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23271: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23364: 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 23276 "configure"
+#line 23369 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23289,15 +23382,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23292: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23295: \$? = $ac_status" >&5
+  echo "$as_me:23388: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23300: \$? = $ac_status" >&5
+  echo "$as_me:23393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -23313,19 +23406,19 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:23316: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:23409: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-echo "$as_me:23322: checking for off_t" >&5
+echo "$as_me:23415: 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 23328 "configure"
+#line 23421 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23340,16 +23433,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23346: \$? = $ac_status" >&5
+  echo "$as_me:23439: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23352: \$? = $ac_status" >&5
+  echo "$as_me:23445: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -23359,10 +23452,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23362: result: $ac_cv_type_off_t" >&5
+echo "$as_me:23455: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:23365: checking size of off_t" >&5
+echo "$as_me:23458: 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
@@ -23371,7 +23464,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 23374 "configure"
+#line 23467 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23383,21 +23476,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23389: \$? = $ac_status" >&5
+  echo "$as_me:23482: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23395: \$? = $ac_status" >&5
+  echo "$as_me:23488: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23400 "configure"
+#line 23493 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23409,16 +23502,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23415: \$? = $ac_status" >&5
+  echo "$as_me:23508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23421: \$? = $ac_status" >&5
+  echo "$as_me:23514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -23434,7 +23527,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23437 "configure"
+#line 23530 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23446,16 +23539,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23452: \$? = $ac_status" >&5
+  echo "$as_me:23545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23458: \$? = $ac_status" >&5
+  echo "$as_me:23551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -23471,7 +23564,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 23474 "configure"
+#line 23567 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23483,16 +23576,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23489: \$? = $ac_status" >&5
+  echo "$as_me:23582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23495: \$? = $ac_status" >&5
+  echo "$as_me:23588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23505,12 +23598,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23508: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23601: 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 23513 "configure"
+#line 23606 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23526,15 +23619,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23532: \$? = $ac_status" >&5
+  echo "$as_me:23625: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23537: \$? = $ac_status" >&5
+  echo "$as_me:23630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -23550,19 +23643,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:23553: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:23646: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
 EOF
 
-echo "$as_me:23559: checking for time_t" >&5
+echo "$as_me:23652: 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 23565 "configure"
+#line 23658 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23577,16 +23670,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23583: \$? = $ac_status" >&5
+  echo "$as_me:23676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23589: \$? = $ac_status" >&5
+  echo "$as_me:23682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -23596,10 +23689,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23599: result: $ac_cv_type_time_t" >&5
+echo "$as_me:23692: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:23602: checking size of time_t" >&5
+echo "$as_me:23695: 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
@@ -23608,7 +23701,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 23611 "configure"
+#line 23704 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23620,21 +23713,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23626: \$? = $ac_status" >&5
+  echo "$as_me:23719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23632: \$? = $ac_status" >&5
+  echo "$as_me:23725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23637 "configure"
+#line 23730 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23646,16 +23739,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23652: \$? = $ac_status" >&5
+  echo "$as_me:23745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23658: \$? = $ac_status" >&5
+  echo "$as_me:23751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -23671,7 +23764,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23674 "configure"
+#line 23767 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23683,16 +23776,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23689: \$? = $ac_status" >&5
+  echo "$as_me:23782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23695: \$? = $ac_status" >&5
+  echo "$as_me:23788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -23708,7 +23801,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 23711 "configure"
+#line 23804 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23720,16 +23813,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23723: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23726: \$? = $ac_status" >&5
+  echo "$as_me:23819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23732: \$? = $ac_status" >&5
+  echo "$as_me:23825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23742,12 +23835,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23745: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23838: 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 23750 "configure"
+#line 23843 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23763,15 +23856,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23859: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23769: \$? = $ac_status" >&5
+  echo "$as_me:23862: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23774: \$? = $ac_status" >&5
+  echo "$as_me:23867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -23787,7 +23880,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:23790: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:23883: 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
@@ -23795,13 +23888,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:23798: checking for working alloca.h" >&5
+echo "$as_me:23891: 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 23804 "configure"
+#line 23897 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -23813,16 +23906,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23909: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23819: \$? = $ac_status" >&5
+  echo "$as_me:23912: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23825: \$? = $ac_status" >&5
+  echo "$as_me:23918: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -23832,7 +23925,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23835: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:23928: 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
 
@@ -23842,13 +23935,13 @@ EOF
 
 fi
 
-echo "$as_me:23845: checking for alloca" >&5
+echo "$as_me:23938: 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 23851 "configure"
+#line 23944 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -23880,16 +23973,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23886: \$? = $ac_status" >&5
+  echo "$as_me:23979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23892: \$? = $ac_status" >&5
+  echo "$as_me:23985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -23899,7 +23992,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23902: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:23995: 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
@@ -23920,13 +24013,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:23923: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:24016: 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 23929 "configure"
+#line 24022 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -23944,18 +24037,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:23947: result: $ac_cv_os_cray" >&5
+echo "$as_me:24040: 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:23952: checking for $ac_func" >&5
+echo "$as_me:24045: 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 23958 "configure"
+#line 24051 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -23986,16 +24079,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23989: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23992: \$? = $ac_status" >&5
+  echo "$as_me:24085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23998: \$? = $ac_status" >&5
+  echo "$as_me:24091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24005,7 +24098,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24008: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24101: 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
 
@@ -24019,7 +24112,7 @@ fi
   done
 fi
 
-echo "$as_me:24022: checking stack direction for C alloca" >&5
+echo "$as_me:24115: 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
@@ -24028,7 +24121,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24031 "configure"
+#line 24124 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -24051,15 +24144,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24057: \$? = $ac_status" >&5
+  echo "$as_me:24150: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24062: \$? = $ac_status" >&5
+  echo "$as_me:24155: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -24071,7 +24164,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:24074: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:24167: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -24083,23 +24176,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:24086: checking for $ac_header" >&5
+echo "$as_me:24179: 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 24092 "configure"
+#line 24185 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24096: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24189: \"$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:24102: \$? = $ac_status" >&5
+  echo "$as_me:24195: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24118,7 +24211,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24121: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24214: 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
@@ -24131,13 +24224,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24134: checking for $ac_func" >&5
+echo "$as_me:24227: 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 24140 "configure"
+#line 24233 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -24168,16 +24261,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24174: \$? = $ac_status" >&5
+  echo "$as_me:24267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24180: \$? = $ac_status" >&5
+  echo "$as_me:24273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24187,7 +24280,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24190: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24283: 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
@@ -24199,7 +24292,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24202: checking for working fork" >&5
+  echo "$as_me:24295: 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
@@ -24222,15 +24315,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24228: \$? = $ac_status" >&5
+  echo "$as_me:24321: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24233: \$? = $ac_status" >&5
+  echo "$as_me:24326: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24242,7 +24335,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:24245: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24338: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24256,12 +24349,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24259: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24352: 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:24264: checking for working vfork" >&5
+  echo "$as_me:24357: 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
@@ -24270,7 +24363,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24273 "configure"
+#line 24366 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24367,15 +24460,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24373: \$? = $ac_status" >&5
+  echo "$as_me:24466: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24378: \$? = $ac_status" >&5
+  echo "$as_me:24471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24387,13 +24480,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:24390: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24483: 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:24396: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24489: 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
 
@@ -24418,14 +24511,14 @@ EOF
 
 fi
 
-echo "$as_me:24421: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:24514: 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 24428 "configure"
+#line 24521 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24442,16 +24535,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24538: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24448: \$? = $ac_status" >&5
+  echo "$as_me:24541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24454: \$? = $ac_status" >&5
+  echo "$as_me:24547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -24459,7 +24552,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24462 "configure"
+#line 24555 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24481,16 +24574,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24487: \$? = $ac_status" >&5
+  echo "$as_me:24580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24493: \$? = $ac_status" >&5
+  echo "$as_me:24586: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -24503,20 +24596,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24506: result: $cf_cv_fionbio" >&5
+echo "$as_me:24599: 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:24512: checking for broken/missing definition of remove" >&5
+echo "$as_me:24605: 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 24519 "configure"
+#line 24612 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24528,23 +24621,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24534: \$? = $ac_status" >&5
+  echo "$as_me:24627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24540: \$? = $ac_status" >&5
+  echo "$as_me:24633: \$? = $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 24547 "configure"
+#line 24640 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -24557,16 +24650,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24563: \$? = $ac_status" >&5
+  echo "$as_me:24656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24569: \$? = $ac_status" >&5
+  echo "$as_me:24662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -24581,20 +24674,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24584: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:24677: 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:24590: checking for lstat" >&5
+echo "$as_me:24683: 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 24597 "configure"
+#line 24690 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24608,16 +24701,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24614: \$? = $ac_status" >&5
+  echo "$as_me:24707: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24620: \$? = $ac_status" >&5
+  echo "$as_me:24713: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -24629,7 +24722,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24632: result: $ac_cv_func_lstat " >&5
+echo "$as_me:24725: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -24663,13 +24756,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24666: checking for $ac_func" >&5
+echo "$as_me:24759: 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 24672 "configure"
+#line 24765 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -24700,16 +24793,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24706: \$? = $ac_status" >&5
+  echo "$as_me:24799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24712: \$? = $ac_status" >&5
+  echo "$as_me:24805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24719,7 +24812,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24722: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24815: 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
@@ -24735,13 +24828,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24738: checking for $ac_func" >&5
+echo "$as_me:24831: 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 24744 "configure"
+#line 24837 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -24772,16 +24865,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24778: \$? = $ac_status" >&5
+  echo "$as_me:24871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24784: \$? = $ac_status" >&5
+  echo "$as_me:24877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24791,7 +24884,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24794: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24887: 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
@@ -24803,7 +24896,7 @@ else
 fi
 done
 
-echo "$as_me:24806: checking for random-integer functions" >&5
+echo "$as_me:24899: 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
@@ -24823,7 +24916,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24826 "configure"
+#line 24919 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -24842,16 +24935,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24848: \$? = $ac_status" >&5
+  echo "$as_me:24941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24854: \$? = $ac_status" >&5
+  echo "$as_me:24947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -24863,10 +24956,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24866: result: $cf_cv_srand_func" >&5
+echo "$as_me:24959: 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:24869: checking for range of random-integers" >&5
+	echo "$as_me:24962: 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
@@ -24887,7 +24980,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24890 "configure"
+#line 24983 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -24906,16 +24999,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24912: \$? = $ac_status" >&5
+  echo "$as_me:25005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24918: \$? = $ac_status" >&5
+  echo "$as_me:25011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24926,7 +25019,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24929: result: $cf_cv_rand_max" >&5
+echo "$as_me:25022: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -24957,13 +25050,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:24960: checking for $ac_func declaration" >&5
+echo "$as_me:25053: 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 24966 "configure"
+#line 25059 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -24977,20 +25070,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24983: \$? = $ac_status" >&5
+  echo "$as_me:25076: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24989: \$? = $ac_status" >&5
+  echo "$as_me:25082: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24993 "configure"
+#line 25086 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -25004,16 +25097,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25007: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25010: \$? = $ac_status" >&5
+  echo "$as_me:25103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25016: \$? = $ac_status" >&5
+  echo "$as_me:25109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -25034,11 +25127,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:25037: result: yes" >&5
+  echo "$as_me:25130: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:25041: result: no" >&5
+  echo "$as_me:25134: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -25053,13 +25146,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:25056: checking for $ac_func declaration" >&5
+echo "$as_me:25149: 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 25062 "configure"
+#line 25155 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25075,20 +25168,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25081: \$? = $ac_status" >&5
+  echo "$as_me:25174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25087: \$? = $ac_status" >&5
+  echo "$as_me:25180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 25091 "configure"
+#line 25184 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25104,16 +25197,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25110: \$? = $ac_status" >&5
+  echo "$as_me:25203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25116: \$? = $ac_status" >&5
+  echo "$as_me:25209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -25134,11 +25227,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:25137: result: yes" >&5
+  echo "$as_me:25230: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:25141: result: no" >&5
+  echo "$as_me:25234: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -25150,14 +25243,14 @@ EOF
 fi
 done
 
-echo "$as_me:25153: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:25246: 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 25160 "configure"
+#line 25253 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -25171,16 +25264,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25177: \$? = $ac_status" >&5
+  echo "$as_me:25270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25183: \$? = $ac_status" >&5
+  echo "$as_me:25276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -25191,7 +25284,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:25194: result: $cf_cv_bool_defs" >&5
+echo "$as_me:25287: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -25204,14 +25297,14 @@ EOF
 
 fi
 
-echo "$as_me:25207: checking if external errno is declared" >&5
+echo "$as_me:25300: 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 25214 "configure"
+#line 25307 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -25229,16 +25322,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25232: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25235: \$? = $ac_status" >&5
+  echo "$as_me:25328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25241: \$? = $ac_status" >&5
+  echo "$as_me:25334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -25249,7 +25342,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25252: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:25345: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -25264,14 +25357,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:25267: checking if external errno exists" >&5
+echo "$as_me:25360: 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 25274 "configure"
+#line 25367 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -25286,16 +25379,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25292: \$? = $ac_status" >&5
+  echo "$as_me:25385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25298: \$? = $ac_status" >&5
+  echo "$as_me:25391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -25306,7 +25399,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25309: result: $cf_cv_have_errno" >&5
+echo "$as_me:25402: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -25319,7 +25412,7 @@ EOF
 
 fi
 
-echo "$as_me:25322: checking if we can set errno" >&5
+echo "$as_me:25415: 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
@@ -25327,7 +25420,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 25330 "configure"
+#line 25423 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -25339,16 +25432,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25435: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25345: \$? = $ac_status" >&5
+  echo "$as_me:25438: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25351: \$? = $ac_status" >&5
+  echo "$as_me:25444: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -25359,7 +25452,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25362 "configure"
+#line 25455 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -25370,15 +25463,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25376: \$? = $ac_status" >&5
+  echo "$as_me:25469: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25381: \$? = $ac_status" >&5
+  echo "$as_me:25474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -25391,20 +25484,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:25394: result: $cf_cv_set_errno" >&5
+echo "$as_me:25487: 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:25400: checking for setlocale()" >&5
+echo "$as_me:25493: 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 25407 "configure"
+#line 25500 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -25416,16 +25509,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25422: \$? = $ac_status" >&5
+  echo "$as_me:25515: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25428: \$? = $ac_status" >&5
+  echo "$as_me:25521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -25437,21 +25530,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:25440: result: $cf_cv_locale" >&5
+echo "$as_me:25533: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:25447: checking if NGROUPS is defined" >&5
+echo "$as_me:25540: 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 25454 "configure"
+#line 25547 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -25470,23 +25563,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25476: \$? = $ac_status" >&5
+  echo "$as_me:25569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25482: \$? = $ac_status" >&5
+  echo "$as_me:25575: \$? = $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 25489 "configure"
+#line 25582 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -25505,16 +25598,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25601: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25511: \$? = $ac_status" >&5
+  echo "$as_me:25604: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25517: \$? = $ac_status" >&5
+  echo "$as_me:25610: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -25526,7 +25619,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:25529: result: $cf_cv_ngroups" >&5
+echo "$as_me:25622: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -25543,14 +25636,14 @@ EOF
 
 fi
 
-echo "$as_me:25546: checking if external sys_nerr is declared" >&5
+echo "$as_me:25639: 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 25553 "configure"
+#line 25646 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -25568,16 +25661,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25574: \$? = $ac_status" >&5
+  echo "$as_me:25667: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25580: \$? = $ac_status" >&5
+  echo "$as_me:25673: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -25588,7 +25681,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25591: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:25684: 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
@@ -25603,14 +25696,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:25606: checking if external sys_nerr exists" >&5
+echo "$as_me:25699: 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 25613 "configure"
+#line 25706 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -25625,16 +25718,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25631: \$? = $ac_status" >&5
+  echo "$as_me:25724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25637: \$? = $ac_status" >&5
+  echo "$as_me:25730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -25645,7 +25738,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25648: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:25741: 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
@@ -25658,14 +25751,14 @@ EOF
 
 fi
 
-echo "$as_me:25661: checking if external sys_errlist is declared" >&5
+echo "$as_me:25754: 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 25668 "configure"
+#line 25761 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -25683,16 +25776,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25689: \$? = $ac_status" >&5
+  echo "$as_me:25782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25695: \$? = $ac_status" >&5
+  echo "$as_me:25788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -25703,7 +25796,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25706: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:25799: 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
@@ -25718,14 +25811,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:25721: checking if external sys_errlist exists" >&5
+echo "$as_me:25814: 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 25728 "configure"
+#line 25821 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -25740,16 +25833,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25746: \$? = $ac_status" >&5
+  echo "$as_me:25839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25752: \$? = $ac_status" >&5
+  echo "$as_me:25845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -25760,7 +25853,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25763: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:25856: 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
@@ -25776,23 +25869,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25779: checking for $ac_header" >&5
+echo "$as_me:25872: 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 25785 "configure"
+#line 25878 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25789: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25882: \"$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:25795: \$? = $ac_status" >&5
+  echo "$as_me:25888: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25811,7 +25904,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25814: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25907: 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
@@ -25821,14 +25914,14 @@ EOF
 fi
 done
 
-echo "$as_me:25824: checking for lastlog path" >&5
+echo "$as_me:25917: 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 25831 "configure"
+#line 25924 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25848,16 +25941,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25854: \$? = $ac_status" >&5
+  echo "$as_me:25947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25860: \$? = $ac_status" >&5
+  echo "$as_me:25953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -25872,13 +25965,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25875: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:25968: 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:25881: checking for utmp implementation" >&5
+echo "$as_me:25974: 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
@@ -25895,7 +25988,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25898 "configure"
+#line 25991 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -25909,16 +26002,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25915: \$? = $ac_status" >&5
+  echo "$as_me:26008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25921: \$? = $ac_status" >&5
+  echo "$as_me:26014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -25927,7 +26020,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25930 "configure"
+#line 26023 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -25941,16 +26034,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25947: \$? = $ac_status" >&5
+  echo "$as_me:26040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25953: \$? = $ac_status" >&5
+  echo "$as_me:26046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -25965,7 +26058,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:25968: result: $cf_cv_have_utmp" >&5
+echo "$as_me:26061: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -25978,14 +26071,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25981: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:26074: 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 25988 "configure"
+#line 26081 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25999,16 +26092,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26095: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26005: \$? = $ac_status" >&5
+  echo "$as_me:26098: \$? = $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:26101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26011: \$? = $ac_status" >&5
+  echo "$as_me:26104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -26020,7 +26113,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:26023: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:26116: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -26029,14 +26122,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26032: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:26125: 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 26039 "configure"
+#line 26132 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26050,16 +26143,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26056: \$? = $ac_status" >&5
+  echo "$as_me:26149: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26062: \$? = $ac_status" >&5
+  echo "$as_me:26155: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -26071,7 +26164,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:26074: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:26167: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
@@ -26080,7 +26173,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26083: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:26176: 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
@@ -26097,7 +26190,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26100 "configure"
+#line 26193 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -26111,16 +26204,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26117: \$? = $ac_status" >&5
+  echo "$as_me:26210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26123: \$? = $ac_status" >&5
+  echo "$as_me:26216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -26132,12 +26225,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:26135: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:26228: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:26140: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:26233: 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; }; }
 	;;
@@ -26151,7 +26244,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26154: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:26247: 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
@@ -26164,7 +26257,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 26167 "configure"
+#line 26260 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26178,16 +26271,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26184: \$? = $ac_status" >&5
+  echo "$as_me:26277: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26190: \$? = $ac_status" >&5
+  echo "$as_me:26283: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -26200,7 +26293,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:26203: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:26296: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -26215,14 +26308,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26218: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:26311: 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 26225 "configure"
+#line 26318 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26236,23 +26329,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26242: \$? = $ac_status" >&5
+  echo "$as_me:26335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26248: \$? = $ac_status" >&5
+  echo "$as_me:26341: \$? = $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 26255 "configure"
+#line 26348 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26266,16 +26359,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26272: \$? = $ac_status" >&5
+  echo "$as_me:26365: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26278: \$? = $ac_status" >&5
+  echo "$as_me:26371: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -26289,7 +26382,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:26292: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:26385: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -26306,14 +26399,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26309: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:26402: 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 26316 "configure"
+#line 26409 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26327,16 +26420,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26333: \$? = $ac_status" >&5
+  echo "$as_me:26426: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26339: \$? = $ac_status" >&5
+  echo "$as_me:26432: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -26347,7 +26440,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:26350: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:26443: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -26357,7 +26450,7 @@ EOF
 fi
 fi
 
-echo "$as_me:26360: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:26453: 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
@@ -26365,7 +26458,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26368 "configure"
+#line 26461 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26384,16 +26477,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26390: \$? = $ac_status" >&5
+  echo "$as_me:26483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26396: \$? = $ac_status" >&5
+  echo "$as_me:26489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -26404,7 +26497,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26407: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:26500: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -26412,14 +26505,14 @@ EOF
 
 fi
 
-echo "$as_me:26415: checking if external h_errno exists" >&5
+echo "$as_me:26508: 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 26422 "configure"
+#line 26515 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -26434,16 +26527,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26440: \$? = $ac_status" >&5
+  echo "$as_me:26533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26446: \$? = $ac_status" >&5
+  echo "$as_me:26539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -26454,7 +26547,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26457: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:26550: 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
@@ -26467,7 +26560,7 @@ EOF
 
 fi
 
-echo "$as_me:26470: checking if bibp: URLs should be supported" >&5
+echo "$as_me:26563: 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.
@@ -26484,13 +26577,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:26487: result: $use_bibp_urls" >&5
+echo "$as_me:26580: 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:26493: checking if configuration info should be browsable" >&5
+echo "$as_me:26586: 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.
@@ -26507,13 +26600,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:26510: result: $use_config_info" >&5
+echo "$as_me:26603: 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:26516: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:26609: 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.
@@ -26530,13 +26623,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:26533: result: $use_forms_options" >&5
+echo "$as_me:26626: 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:26539: checking if old-style options menu should be used" >&5
+echo "$as_me:26632: 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.
@@ -26553,13 +26646,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:26556: result: $use_menu_options" >&5
+echo "$as_me:26649: 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:26562: checking if experimental address-list page should be used" >&5
+echo "$as_me:26655: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -26576,13 +26669,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:26579: result: $use_addrlist_page" >&5
+echo "$as_me:26672: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:26585: checking if experimental ascii case-conversion" >&5
+echo "$as_me:26678: checking if experimental ascii case-conversion" >&5
 echo $ECHO_N "checking if experimental ascii case-conversion... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -26599,13 +26692,13 @@ else
   use_ascii_ctypes=no
 
 fi;
-echo "$as_me:26602: result: $use_ascii_ctypes" >&5
+echo "$as_me:26695: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no && cat >>confdefs.h <<\EOF
 #define EXP_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:26608: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:26701: checking if experimental charset-selection logic should be used" >&5
 echo $ECHO_N "checking if experimental charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -26622,13 +26715,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:26625: result: $use_charset_choice" >&5
+echo "$as_me:26718: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define EXP_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:26631: checking if experimental CJK logic should be used" >&5
+echo "$as_me:26724: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -26645,13 +26738,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:26648: result: $use_cjk" >&5
+echo "$as_me:26741: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no && cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:26654: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:26747: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -26668,7 +26761,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:26671: result: $use_ja_utf8" >&5
+echo "$as_me:26764: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -26713,7 +26806,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26716 "configure"
+#line 26809 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26725,16 +26818,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26728: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26731: \$? = $ac_status" >&5
+  echo "$as_me:26824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26737: \$? = $ac_status" >&5
+  echo "$as_me:26830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26751,7 +26844,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}:26754: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26847: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26792,7 +26885,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26795 "configure"
+#line 26888 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26804,16 +26897,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26810: \$? = $ac_status" >&5
+  echo "$as_me:26903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26816: \$? = $ac_status" >&5
+  echo "$as_me:26909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26830,7 +26923,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}:26833: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26926: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26846,7 +26939,7 @@ echo "${as_me-configure}:26833: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:26849: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:26942: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26871,7 +26964,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}:26874: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26967: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26900,7 +26993,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}:26903: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26996: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26909,7 +27002,7 @@ echo "${as_me-configure}:26903: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:26912: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:27005: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26920,7 +27013,7 @@ done
 
 fi;
 
-  echo "$as_me:26923: checking for iconv" >&5
+  echo "$as_me:27016: 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
@@ -26931,10 +27024,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:26934: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:27027: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 26937 "configure"
+#line 27030 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -26953,16 +27046,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26959: \$? = $ac_status" >&5
+  echo "$as_me:27052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26965: \$? = $ac_status" >&5
+  echo "$as_me:27058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -26973,9 +27066,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me-configure}:26976: testing find linkage for iconv library ..." 1>&5
+echo "${as_me-configure}:27069: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:26978: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:27071: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27083,11 +27176,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:27086: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:27179: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 27090 "configure"
+#line 27183 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -27106,21 +27199,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27112: \$? = $ac_status" >&5
+  echo "$as_me:27205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27118: \$? = $ac_status" >&5
+  echo "$as_me:27211: \$? = $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}:27123: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:27216: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27138,7 +27231,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:27141: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:27234: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -27234,13 +27327,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}:27237: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:27330: 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 27243 "configure"
+#line 27336 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -27259,21 +27352,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27265: \$? = $ac_status" >&5
+  echo "$as_me:27358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27271: \$? = $ac_status" >&5
+  echo "$as_me:27364: \$? = $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}:27276: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:27369: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -27309,7 +27402,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:27312: result: $am_cv_func_iconv" >&5
+echo "$as_me:27405: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -27318,14 +27411,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:27321: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:27414: 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 27328 "configure"
+#line 27421 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -27350,16 +27443,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27356: \$? = $ac_status" >&5
+  echo "$as_me:27449: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27362: \$? = $ac_status" >&5
+  echo "$as_me:27455: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -27369,7 +27462,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27372: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:27465: 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
@@ -27411,7 +27504,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 27414 "configure"
+#line 27507 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27423,16 +27516,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27429: \$? = $ac_status" >&5
+  echo "$as_me:27522: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27435: \$? = $ac_status" >&5
+  echo "$as_me:27528: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27449,7 +27542,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}:27452: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:27545: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27486,7 +27579,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}:27489: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:27582: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27510,7 +27603,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:27513: checking if you want to use default-colors" >&5
+echo "$as_me:27606: 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.
@@ -27527,7 +27620,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:27530: result: $use_dft_colors" >&5
+echo "$as_me:27623: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -27535,7 +27628,7 @@ EOF
 
 fi
 
-echo "$as_me:27538: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:27631: 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.
@@ -27552,13 +27645,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:27555: result: $use_kbd_layout" >&5
+echo "$as_me:27648: 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:27561: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:27654: 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.
@@ -27575,13 +27668,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:27578: result: $use_nested_tables" >&5
+echo "$as_me:27671: 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:27584: checking if progress-bar code should be used" >&5
+echo "$as_me:27677: 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.
@@ -27598,13 +27691,13 @@ else
   use_progressbar=no
 
 fi;
-echo "$as_me:27601: result: $use_progressbar" >&5
+echo "$as_me:27694: 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:27607: checking if scrollbar code should be used" >&5
+echo "$as_me:27700: 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.
@@ -27621,10 +27714,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:27624: result: $use_scrollbar" >&5
+echo "$as_me:27717: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:27627: checking if sessions code should be used" >&5
+echo "$as_me:27720: 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.
@@ -27641,7 +27734,7 @@ else
   use_sessions=no
 
 fi;
-echo "$as_me:27644: result: $use_sessions" >&5
+echo "$as_me:27737: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 	cat >>confdefs.h <<\EOF
@@ -27651,7 +27744,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:27654: checking if session-caching code should be used" >&5
+echo "$as_me:27747: 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.
@@ -27668,7 +27761,7 @@ else
   use_session_cache=no
 
 fi;
-echo "$as_me:27671: result: $use_session_cache" >&5
+echo "$as_me:27764: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -27677,7 +27770,7 @@ EOF
 
 fi
 
-echo "$as_me:27680: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:27773: 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.
@@ -27694,13 +27787,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:27697: result: $use_alt_bindings" >&5
+echo "$as_me:27790: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:27703: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:27796: 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.
@@ -27717,13 +27810,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:27720: result: $use_ext_htmldtd" >&5
+echo "$as_me:27813: 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:27726: checking if file-upload logic should be used" >&5
+echo "$as_me:27819: 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.
@@ -27740,13 +27833,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:27743: result: $use_file_upload" >&5
+echo "$as_me:27836: 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:27749: checking if element-justification logic should be used" >&5
+echo "$as_me:27842: 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.
@@ -27763,13 +27856,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:27766: result: $use_justify_elts" >&5
+echo "$as_me:27859: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no && cat >>confdefs.h <<\EOF
 #define EXP_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:27772: checking if partial-display should be used" >&5
+echo "$as_me:27865: 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.
@@ -27786,13 +27879,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:27789: result: $use_partial_display" >&5
+echo "$as_me:27882: 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:27795: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:27888: 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.
@@ -27809,13 +27902,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:27812: result: $use_filed_cookies" >&5
+echo "$as_me:27905: 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:27818: checking if html source should be colorized" >&5
+echo "$as_me:27911: 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.
@@ -27832,13 +27925,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:27835: result: $use_prettysrc" >&5
+echo "$as_me:27928: 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:27841: checking if read-progress message should show ETA" >&5
+echo "$as_me:27934: 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.
@@ -27855,13 +27948,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:27858: result: $use_read_eta" >&5
+echo "$as_me:27951: 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:27864: checking if source caching should be used" >&5
+echo "$as_me:27957: 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.
@@ -27878,13 +27971,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:27881: result: $use_source_cache" >&5
+echo "$as_me:27974: 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:27887: checking if you want to use external commands" >&5
+echo "$as_me:27980: 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.
@@ -27901,7 +27994,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:27904: result: $use_externs" >&5
+echo "$as_me:27997: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -27911,7 +28004,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:27914: checking if you want to use setfont support" >&5
+echo "$as_me:28007: 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.
@@ -27928,7 +28021,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:27931: result: $use_setfont" >&5
+echo "$as_me:28024: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -27939,7 +28032,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:27942: checking for $ac_word" >&5
+echo "$as_me:28035: 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
@@ -27956,7 +28049,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:27959: found $ac_dir/$ac_word" >&5
+   echo "$as_me:28052: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27967,10 +28060,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:27970: result: $SETFONT" >&5
+  echo "$as_me:28063: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:27973: result: no" >&5
+  echo "$as_me:28066: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28038,7 +28131,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28041: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28134: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -28055,19 +28148,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:28058: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me-configure}:28151: 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}:28065: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me-configure}:28158: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:28070: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:28163: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 		cat >>confdefs.h <<\EOF
@@ -28077,7 +28170,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:28080: checking if you want cgi-link support" >&5
+echo "$as_me:28173: 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.
@@ -28093,10 +28186,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:28096: result: $enableval" >&5
+echo "$as_me:28189: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:28099: checking if you want change-exec support" >&5
+echo "$as_me:28192: 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.
@@ -28113,13 +28206,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:28116: result: $use_change_exec" >&5
+echo "$as_me:28209: 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:28122: checking if you want exec-links support" >&5
+echo "$as_me:28215: 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.
@@ -28136,13 +28229,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:28139: result: $use_exec_links" >&5
+echo "$as_me:28232: 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:28145: checking if you want exec-scripts support" >&5
+echo "$as_me:28238: 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.
@@ -28159,13 +28252,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:28162: result: $use_exec_scripts" >&5
+echo "$as_me:28255: 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:28168: checking if you want internal-links feature" >&5
+echo "$as_me:28261: 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.
@@ -28182,13 +28275,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:28185: result: $use_internal_links" >&5
+echo "$as_me:28278: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:28191: checking if you want to fork NSL requests" >&5
+echo "$as_me:28284: 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.
@@ -28205,7 +28298,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:28208: result: $use_nsl_fork" >&5
+echo "$as_me:28301: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -28224,7 +28317,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:28227: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:28320: 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.
@@ -28241,13 +28334,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:28244: result: $use_syslog" >&5
+echo "$as_me:28337: 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:28250: checking if you want to underline links" >&5
+echo "$as_me:28343: 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.
@@ -28264,7 +28357,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:28267: result: $use_underline" >&5
+echo "$as_me:28360: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -28274,7 +28367,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:28277: checking if help files should be gzip'ed" >&5
+echo "$as_me:28370: 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.
@@ -28291,10 +28384,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:28294: result: $use_gzip_help" >&5
+echo "$as_me:28387: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:28297: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:28390: 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.
@@ -28304,7 +28397,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:28307: result: $use_bzlib" >&5
+echo "$as_me:28400: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -28343,7 +28436,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 28346 "configure"
+#line 28439 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28355,16 +28448,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28451: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28361: \$? = $ac_status" >&5
+  echo "$as_me:28454: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28367: \$? = $ac_status" >&5
+  echo "$as_me:28460: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28381,7 +28474,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}:28384: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28477: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28422,7 +28515,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 28425 "configure"
+#line 28518 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28434,16 +28527,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28440: \$? = $ac_status" >&5
+  echo "$as_me:28533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28446: \$? = $ac_status" >&5
+  echo "$as_me:28539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28460,7 +28553,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}:28463: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28556: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28476,7 +28569,7 @@ echo "${as_me-configure}:28463: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:28479: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:28572: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -28501,7 +28594,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}:28504: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28597: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28530,7 +28623,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}:28533: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28626: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28539,7 +28632,7 @@ echo "${as_me-configure}:28533: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:28542: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:28635: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -28553,10 +28646,10 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:28556: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28649: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28559 "configure"
+#line 28652 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28573,16 +28666,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28579: \$? = $ac_status" >&5
+  echo "$as_me:28672: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28585: \$? = $ac_status" >&5
+  echo "$as_me:28678: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_bz2=yes
 else
@@ -28593,9 +28686,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me-configure}:28596: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me-configure}:28689: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me-configure}:28598: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28691: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -28703,11 +28796,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_bz2 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:28706: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28799: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
         cat >conftest.$ac_ext <<_ACEOF
-#line 28710 "configure"
+#line 28803 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28724,21 +28817,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28730: \$? = $ac_status" >&5
+  echo "$as_me:28823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28736: \$? = $ac_status" >&5
+  echo "$as_me:28829: \$? = $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}:28741: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28834: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -28756,7 +28849,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:28759: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28852: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -28764,7 +28857,7 @@ echo "${as_me-configure}:28759: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 28767 "configure"
+#line 28860 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28781,21 +28874,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28787: \$? = $ac_status" >&5
+  echo "$as_me:28880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28793: \$? = $ac_status" >&5
+  echo "$as_me:28886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:28798: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me-configure}:28891: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -28897,13 +28990,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}:28900: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28993: 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 28906 "configure"
+#line 28999 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28920,21 +29013,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28926: \$? = $ac_status" >&5
+  echo "$as_me:29019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28932: \$? = $ac_status" >&5
+  echo "$as_me:29025: \$? = $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}:28937: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:29030: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -28989,7 +29082,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 28992 "configure"
+#line 29085 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29001,16 +29094,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29007: \$? = $ac_status" >&5
+  echo "$as_me:29100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29013: \$? = $ac_status" >&5
+  echo "$as_me:29106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29027,7 +29120,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}:29030: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29123: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29061,7 +29154,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}:29064: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29157: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29072,7 +29165,7 @@ fi
   LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:29075: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:29168: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -29082,7 +29175,7 @@ EOF
 
 fi
 
-echo "$as_me:29085: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:29178: 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.
@@ -29092,7 +29185,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:29095: result: $use_zlib" >&5
+echo "$as_me:29188: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -29131,7 +29224,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29134 "configure"
+#line 29227 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29143,16 +29236,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29149: \$? = $ac_status" >&5
+  echo "$as_me:29242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29155: \$? = $ac_status" >&5
+  echo "$as_me:29248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29169,7 +29262,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}:29172: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29265: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29210,7 +29303,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29213 "configure"
+#line 29306 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29222,16 +29315,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29318: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29228: \$? = $ac_status" >&5
+  echo "$as_me:29321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29234: \$? = $ac_status" >&5
+  echo "$as_me:29327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29248,7 +29341,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}:29251: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29344: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29264,7 +29357,7 @@ echo "${as_me-configure}:29251: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:29267: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:29360: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29289,7 +29382,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}:29292: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29385: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29318,7 +29411,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}:29321: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29414: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29327,7 +29420,7 @@ echo "${as_me-configure}:29321: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:29330: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:29423: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29341,10 +29434,10 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:29344: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:29437: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29347 "configure"
+#line 29440 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29360,16 +29453,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29366: \$? = $ac_status" >&5
+  echo "$as_me:29459: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29372: \$? = $ac_status" >&5
+  echo "$as_me:29465: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_z=yes
 else
@@ -29380,9 +29473,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me-configure}:29383: testing find linkage for z library ..." 1>&5
+echo "${as_me-configure}:29476: testing find linkage for z library ..." 1>&5
 
-echo "${as_me-configure}:29385: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:29478: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -29490,11 +29583,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_z ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:29493: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:29586: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
         cat >conftest.$ac_ext <<_ACEOF
-#line 29497 "configure"
+#line 29590 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29510,21 +29603,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29513: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29516: \$? = $ac_status" >&5
+  echo "$as_me:29609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29522: \$? = $ac_status" >&5
+  echo "$as_me:29615: \$? = $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}:29527: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:29620: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -29542,7 +29635,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:29545: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:29638: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -29550,7 +29643,7 @@ echo "${as_me-configure}:29545: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 29553 "configure"
+#line 29646 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29566,21 +29659,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29572: \$? = $ac_status" >&5
+  echo "$as_me:29665: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29578: \$? = $ac_status" >&5
+  echo "$as_me:29671: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:29583: testing ... found z library in system ..." 1>&5
+echo "${as_me-configure}:29676: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -29682,13 +29775,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}:29685: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:29778: 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 29691 "configure"
+#line 29784 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29704,21 +29797,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29710: \$? = $ac_status" >&5
+  echo "$as_me:29803: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29716: \$? = $ac_status" >&5
+  echo "$as_me:29809: \$? = $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}:29721: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:29814: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -29773,7 +29866,7 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29776 "configure"
+#line 29869 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29785,16 +29878,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29791: \$? = $ac_status" >&5
+  echo "$as_me:29884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29797: \$? = $ac_status" >&5
+  echo "$as_me:29890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29811,7 +29904,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}:29814: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29907: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29845,7 +29938,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}:29848: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29941: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29856,7 +29949,7 @@ fi
   LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:29859: WARNING: Cannot find z library" >&5
+{ echo "$as_me:29952: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -29866,7 +29959,7 @@ EOF
 
 fi
 
-echo "$as_me:29869: checking if you want to exclude FINGER code" >&5
+echo "$as_me:29962: 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.
@@ -29883,13 +29976,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:29886: result: $use_finger" >&5
+echo "$as_me:29979: 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:29892: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:29985: 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.
@@ -29906,13 +29999,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:29909: result: $use_gopher" >&5
+echo "$as_me:30002: 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:29915: checking if you want to exclude NEWS code" >&5
+echo "$as_me:30008: 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.
@@ -29929,13 +30022,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:29932: result: $use_news" >&5
+echo "$as_me:30025: 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:29938: checking if you want to exclude FTP code" >&5
+echo "$as_me:30031: 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.
@@ -29952,7 +30045,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:29955: result: $use_ftp" >&5
+echo "$as_me:30048: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -29960,7 +30053,7 @@ EOF
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:29963: checking if directory-editor code should be used" >&5
+echo "$as_me:30056: 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.
@@ -29977,7 +30070,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:29980: result: $use_dired" >&5
+echo "$as_me:30073: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -29986,7 +30079,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:29989: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:30082: 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.
@@ -30002,10 +30095,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:30005: result: $enableval" >&5
+	echo "$as_me:30098: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30008: checking if DirEd mode should override keys" >&5
+	echo "$as_me:30101: 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.
@@ -30027,10 +30120,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30030: result: $enableval" >&5
+	echo "$as_me:30123: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30033: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:30126: 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.
@@ -30052,10 +30145,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30055: result: $enableval" >&5
+	echo "$as_me:30148: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30058: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:30151: 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.
@@ -30071,10 +30164,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:30074: result: $enableval" >&5
+	echo "$as_me:30167: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30077: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:30170: 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.
@@ -30096,10 +30189,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30099: result: $enableval" >&5
+	echo "$as_me:30192: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30102: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:30195: 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.
@@ -30121,10 +30214,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30124: result: $enableval" >&5
+	echo "$as_me:30217: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30127: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:30220: 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.
@@ -30146,10 +30239,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30149: result: $enableval" >&5
+	echo "$as_me:30242: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30152: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:30245: 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.
@@ -30171,11 +30264,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:30174: result: $enableval" >&5
+	echo "$as_me:30267: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:30178: checking if you want long-directory listings" >&5
+echo "$as_me:30271: 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.
@@ -30197,10 +30290,10 @@ else
 EOF
 
 fi;
-echo "$as_me:30200: result: $enableval" >&5
+echo "$as_me:30293: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:30203: checking if parent-directory references are permitted" >&5
+echo "$as_me:30296: 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.
@@ -30216,7 +30309,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:30219: result: $enableval" >&5
+echo "$as_me:30312: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -30224,7 +30317,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:30227: checking for $ac_word" >&5
+echo "$as_me:30320: 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
@@ -30241,7 +30334,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:30244: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30337: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30252,10 +30345,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:30255: result: $TELNET" >&5
+  echo "$as_me:30348: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:30258: result: no" >&5
+  echo "$as_me:30351: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30323,7 +30416,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30326: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30419: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -30340,7 +30433,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:30343: checking for $ac_word" >&5
+echo "$as_me:30436: 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
@@ -30357,7 +30450,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:30360: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30453: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30368,10 +30461,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:30371: result: $TN3270" >&5
+  echo "$as_me:30464: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:30374: result: no" >&5
+  echo "$as_me:30467: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30439,7 +30532,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30442: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30535: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -30456,7 +30549,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:30459: checking for $ac_word" >&5
+echo "$as_me:30552: 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
@@ -30473,7 +30566,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:30476: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30569: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30484,10 +30577,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:30487: result: $RLOGIN" >&5
+  echo "$as_me:30580: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:30490: result: no" >&5
+  echo "$as_me:30583: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30555,7 +30648,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30558: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30651: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -30572,7 +30665,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:30575: checking for $ac_word" >&5
+echo "$as_me:30668: 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
@@ -30589,7 +30682,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:30592: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30685: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30600,10 +30693,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:30603: result: $MV" >&5
+  echo "$as_me:30696: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:30606: result: no" >&5
+  echo "$as_me:30699: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30671,7 +30764,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30674: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30767: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -30688,7 +30781,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:30691: checking for $ac_word" >&5
+echo "$as_me:30784: 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
@@ -30705,7 +30798,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:30708: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30801: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30716,10 +30809,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:30719: result: $GZIP" >&5
+  echo "$as_me:30812: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:30722: result: no" >&5
+  echo "$as_me:30815: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30787,7 +30880,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30790: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30883: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -30804,7 +30897,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:30807: checking for $ac_word" >&5
+echo "$as_me:30900: 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
@@ -30821,7 +30914,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:30824: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30917: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30832,10 +30925,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:30835: result: $UNCOMPRESS" >&5
+  echo "$as_me:30928: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:30838: result: no" >&5
+  echo "$as_me:30931: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30903,7 +30996,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30906: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30999: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -30920,7 +31013,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:30923: checking for $ac_word" >&5
+echo "$as_me:31016: 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
@@ -30937,7 +31030,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:30940: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31033: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30948,10 +31041,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:30951: result: $UNZIP" >&5
+  echo "$as_me:31044: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:30954: result: no" >&5
+  echo "$as_me:31047: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31019,7 +31112,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31022: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31115: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -31036,7 +31129,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:31039: checking for $ac_word" >&5
+echo "$as_me:31132: 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
@@ -31053,7 +31146,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:31056: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31149: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31064,10 +31157,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:31067: result: $BZIP2" >&5
+  echo "$as_me:31160: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:31070: result: no" >&5
+  echo "$as_me:31163: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31135,7 +31228,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31138: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31231: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -31152,7 +31245,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:31155: checking for $ac_word" >&5
+echo "$as_me:31248: 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
@@ -31169,7 +31262,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:31172: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31265: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31180,10 +31273,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:31183: result: $TAR" >&5
+  echo "$as_me:31276: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:31186: result: no" >&5
+  echo "$as_me:31279: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31251,7 +31344,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31254: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31347: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -31308,7 +31401,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:31311: checking for $ac_word" >&5
+echo "$as_me:31404: 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
@@ -31325,7 +31418,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:31328: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31421: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31336,10 +31429,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:31339: result: $COMPRESS" >&5
+  echo "$as_me:31432: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:31342: result: no" >&5
+  echo "$as_me:31435: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31407,7 +31500,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31410: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31503: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -31424,7 +31517,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:31427: checking for $ac_word" >&5
+echo "$as_me:31520: 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
@@ -31441,7 +31534,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:31444: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31537: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31452,10 +31545,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:31455: result: $RM" >&5
+  echo "$as_me:31548: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:31458: result: no" >&5
+  echo "$as_me:31551: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31523,7 +31616,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31526: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31619: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -31540,7 +31633,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:31543: checking for $ac_word" >&5
+echo "$as_me:31636: 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
@@ -31557,7 +31650,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:31560: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31653: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31568,10 +31661,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:31571: result: $UUDECODE" >&5
+  echo "$as_me:31664: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:31574: result: no" >&5
+  echo "$as_me:31667: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31639,7 +31732,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31642: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31735: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -31656,7 +31749,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:31659: checking for $ac_word" >&5
+echo "$as_me:31752: 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
@@ -31673,7 +31766,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:31676: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31769: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31684,10 +31777,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:31687: result: $ZCAT" >&5
+  echo "$as_me:31780: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:31690: result: no" >&5
+  echo "$as_me:31783: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31755,7 +31848,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31758: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31851: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -31772,7 +31865,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:31775: checking for $ac_word" >&5
+echo "$as_me:31868: 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
@@ -31789,7 +31882,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:31792: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31885: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31800,10 +31893,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:31803: result: $ZIP" >&5
+  echo "$as_me:31896: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:31806: result: no" >&5
+  echo "$as_me:31899: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31871,7 +31964,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31874: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31967: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -31898,7 +31991,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:31901: checking for $ac_word" >&5
+echo "$as_me:31994: 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
@@ -31915,7 +32008,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:31918: found $ac_dir/$ac_word" >&5
+   echo "$as_me:32011: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31926,10 +32019,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:31929: result: $INSTALL" >&5
+  echo "$as_me:32022: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:31932: result: no" >&5
+  echo "$as_me:32025: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31997,7 +32090,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:32000: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:32093: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -32023,7 +32116,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:32026: checking for X" >&5
+	echo "$as_me:32119: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -32120,17 +32213,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 32123 "configure"
+#line 32216 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:32127: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:32220: \"$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:32133: \$? = $ac_status" >&5
+  echo "$as_me:32226: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -32163,7 +32256,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 32166 "configure"
+#line 32259 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -32175,16 +32268,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32181: \$? = $ac_status" >&5
+  echo "$as_me:32274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32187: \$? = $ac_status" >&5
+  echo "$as_me:32280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -32222,7 +32315,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:32225: result: $have_x" >&5
+  echo "$as_me:32318: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -32232,7 +32325,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:32235: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:32328: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -32256,11 +32349,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:32259: checking whether -R must be followed by a space" >&5
+      echo "$as_me:32352: 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 32263 "configure"
+#line 32356 "configure"
 #include "confdefs.h"
 
 int
@@ -32272,16 +32365,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32278: \$? = $ac_status" >&5
+  echo "$as_me:32371: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32284: \$? = $ac_status" >&5
+  echo "$as_me:32377: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -32291,13 +32384,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:32294: result: no" >&5
+	echo "$as_me:32387: 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 32300 "configure"
+#line 32393 "configure"
 #include "confdefs.h"
 
 int
@@ -32309,16 +32402,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32315: \$? = $ac_status" >&5
+  echo "$as_me:32408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32321: \$? = $ac_status" >&5
+  echo "$as_me:32414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -32328,11 +32421,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:32331: result: yes" >&5
+	  echo "$as_me:32424: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:32335: result: neither works" >&5
+	  echo "$as_me:32428: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -32352,7 +32445,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 32355 "configure"
+#line 32448 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32371,22 +32464,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32377: \$? = $ac_status" >&5
+  echo "$as_me:32470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32383: \$? = $ac_status" >&5
+  echo "$as_me:32476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:32389: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:32482: 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
@@ -32394,7 +32487,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32397 "configure"
+#line 32490 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32413,16 +32506,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32419: \$? = $ac_status" >&5
+  echo "$as_me:32512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32425: \$? = $ac_status" >&5
+  echo "$as_me:32518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -32433,14 +32526,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32436: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:32529: 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:32443: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:32536: 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
@@ -32448,7 +32541,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32451 "configure"
+#line 32544 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32467,16 +32560,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32563: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32473: \$? = $ac_status" >&5
+  echo "$as_me:32566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32479: \$? = $ac_status" >&5
+  echo "$as_me:32572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -32487,7 +32580,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32490: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:32583: 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"
@@ -32506,13 +32599,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:32509: checking for gethostbyname" >&5
+    echo "$as_me:32602: 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 32515 "configure"
+#line 32608 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -32543,16 +32636,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32549: \$? = $ac_status" >&5
+  echo "$as_me:32642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32555: \$? = $ac_status" >&5
+  echo "$as_me:32648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -32562,11 +32655,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32565: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:32658: 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:32569: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:32662: 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
@@ -32574,7 +32667,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32577 "configure"
+#line 32670 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32593,16 +32686,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32599: \$? = $ac_status" >&5
+  echo "$as_me:32692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32605: \$? = $ac_status" >&5
+  echo "$as_me:32698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -32613,14 +32706,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32616: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:32709: 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:32623: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:32716: 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
@@ -32628,7 +32721,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32631 "configure"
+#line 32724 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32647,16 +32740,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32653: \$? = $ac_status" >&5
+  echo "$as_me:32746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32659: \$? = $ac_status" >&5
+  echo "$as_me:32752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -32667,7 +32760,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32670: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:32763: 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"
@@ -32683,13 +32776,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:32686: checking for connect" >&5
+    echo "$as_me:32779: 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 32692 "configure"
+#line 32785 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -32720,16 +32813,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32726: \$? = $ac_status" >&5
+  echo "$as_me:32819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32732: \$? = $ac_status" >&5
+  echo "$as_me:32825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -32739,11 +32832,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32742: result: $ac_cv_func_connect" >&5
+echo "$as_me:32835: 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:32746: checking for connect in -lsocket" >&5
+      echo "$as_me:32839: 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
@@ -32751,7 +32844,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32754 "configure"
+#line 32847 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32770,16 +32863,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32776: \$? = $ac_status" >&5
+  echo "$as_me:32869: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32782: \$? = $ac_status" >&5
+  echo "$as_me:32875: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -32790,7 +32883,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32793: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:32886: 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"
@@ -32799,13 +32892,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:32802: checking for remove" >&5
+    echo "$as_me:32895: 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 32808 "configure"
+#line 32901 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -32836,16 +32929,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32842: \$? = $ac_status" >&5
+  echo "$as_me:32935: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32848: \$? = $ac_status" >&5
+  echo "$as_me:32941: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -32855,11 +32948,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32858: result: $ac_cv_func_remove" >&5
+echo "$as_me:32951: 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:32862: checking for remove in -lposix" >&5
+      echo "$as_me:32955: 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
@@ -32867,7 +32960,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32870 "configure"
+#line 32963 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32886,16 +32979,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32892: \$? = $ac_status" >&5
+  echo "$as_me:32985: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32898: \$? = $ac_status" >&5
+  echo "$as_me:32991: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -32906,7 +32999,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32909: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:33002: 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"
@@ -32915,13 +33008,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:32918: checking for shmat" >&5
+    echo "$as_me:33011: 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 32924 "configure"
+#line 33017 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -32952,16 +33045,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32958: \$? = $ac_status" >&5
+  echo "$as_me:33051: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32964: \$? = $ac_status" >&5
+  echo "$as_me:33057: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -32971,11 +33064,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32974: result: $ac_cv_func_shmat" >&5
+echo "$as_me:33067: 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:32978: checking for shmat in -lipc" >&5
+      echo "$as_me:33071: 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
@@ -32983,7 +33076,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32986 "configure"
+#line 33079 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33002,16 +33095,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33008: \$? = $ac_status" >&5
+  echo "$as_me:33101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33014: \$? = $ac_status" >&5
+  echo "$as_me:33107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -33022,7 +33115,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33025: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:33118: 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"
@@ -33040,7 +33133,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:33043: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:33136: 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
@@ -33048,7 +33141,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33051 "configure"
+#line 33144 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33067,16 +33160,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33073: \$? = $ac_status" >&5
+  echo "$as_me:33166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33079: \$? = $ac_status" >&5
+  echo "$as_me:33172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -33087,7 +33180,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33090: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:33183: 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"
@@ -33105,7 +33198,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:33108: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:33201: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -33166,7 +33259,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}:33169: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:33262: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -33174,7 +33267,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}:33177: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:33270: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -33182,14 +33275,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:33185: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:33278: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 33192 "configure"
+#line 33285 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33201,16 +33294,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33207: \$? = $ac_status" >&5
+  echo "$as_me:33300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33213: \$? = $ac_status" >&5
+  echo "$as_me:33306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33218,12 +33311,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:33221: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:33314: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:33226: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:33319: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -33231,13 +33324,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:33234: checking for XOpenDisplay" >&5
+echo "$as_me:33327: 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 33240 "configure"
+#line 33333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -33268,16 +33361,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33274: \$? = $ac_status" >&5
+  echo "$as_me:33367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33280: \$? = $ac_status" >&5
+  echo "$as_me:33373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -33287,13 +33380,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:33290: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:33383: 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:33296: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:33389: 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
@@ -33301,7 +33394,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33304 "configure"
+#line 33397 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33320,16 +33413,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33326: \$? = $ac_status" >&5
+  echo "$as_me:33419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33332: \$? = $ac_status" >&5
+  echo "$as_me:33425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -33340,7 +33433,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33343: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:33436: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -33348,13 +33441,13 @@ fi
 
 fi
 
-echo "$as_me:33351: checking for XtAppInitialize" >&5
+echo "$as_me:33444: 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 33357 "configure"
+#line 33450 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -33385,16 +33478,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33391: \$? = $ac_status" >&5
+  echo "$as_me:33484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33397: \$? = $ac_status" >&5
+  echo "$as_me:33490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -33404,13 +33497,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:33407: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:33500: 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:33413: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:33506: 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
@@ -33418,7 +33511,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33421 "configure"
+#line 33514 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33437,16 +33530,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33443: \$? = $ac_status" >&5
+  echo "$as_me:33536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33449: \$? = $ac_status" >&5
+  echo "$as_me:33542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -33457,7 +33550,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33460: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:33553: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
   cat >>confdefs.h <<\EOF
@@ -33471,7 +33564,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:33474: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:33567: 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
@@ -33481,7 +33574,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:33484: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:33577: 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=
 
@@ -33492,14 +33585,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:33495: result: yes" >&5
+	echo "$as_me:33588: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:33498: result: no" >&5
+	echo "$as_me:33591: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:33502: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:33595: 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=
 
@@ -33510,14 +33603,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:33513: result: yes" >&5
+	echo "$as_me:33606: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:33516: result: no" >&5
+	echo "$as_me:33609: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:33520: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:33613: 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=
 
@@ -33528,14 +33621,14 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:33531: result: yes" >&5
+	echo "$as_me:33624: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:33534: result: no" >&5
+	echo "$as_me:33627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:33538: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:33631: 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
@@ -33543,7 +33636,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33546 "configure"
+#line 33639 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33562,16 +33655,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33568: \$? = $ac_status" >&5
+  echo "$as_me:33661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33574: \$? = $ac_status" >&5
+  echo "$as_me:33667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -33582,7 +33675,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33585: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:33678: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -33604,14 +33697,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:33607: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:33700: 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:33610: checking for $cf_test" >&5
+			echo "$as_me:33703: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 33614 "configure"
+#line 33707 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -33625,16 +33718,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33721: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33631: \$? = $ac_status" >&5
+  echo "$as_me:33724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33637: \$? = $ac_status" >&5
+  echo "$as_me:33730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -33643,7 +33736,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:33646: result: $cf_result" >&5
+		echo "$as_me:33739: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -33655,7 +33748,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:33658: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:33751: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -33680,15 +33773,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:33683: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:33776: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:33687: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:33780: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 33691 "configure"
+#line 33784 "configure"
 #include "confdefs.h"
 
 int
@@ -33700,16 +33793,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33706: \$? = $ac_status" >&5
+  echo "$as_me:33799: \$? = $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:33802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33712: \$? = $ac_status" >&5
+  echo "$as_me:33805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -33718,7 +33811,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:33721: result: $cf_result" >&5
+			echo "$as_me:33814: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -33730,7 +33823,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:33733: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:33826: 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
@@ -33745,7 +33838,7 @@ for ac_prog in xcurses-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:33748: checking for $ac_word" >&5
+echo "$as_me:33841: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -33762,7 +33855,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:33765: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33858: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33773,10 +33866,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:33776: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:33869: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:33779: result: no" >&5
+  echo "$as_me:33872: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -33797,7 +33890,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:33800: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:33893: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -33858,7 +33951,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}:33861: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:33954: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -33866,7 +33959,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}:33869: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:33962: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -33874,14 +33967,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:33877: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:33970: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 33884 "configure"
+#line 33977 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33893,16 +33986,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33899: \$? = $ac_status" >&5
+  echo "$as_me:33992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33905: \$? = $ac_status" >&5
+  echo "$as_me:33998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33910,12 +34003,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:33913: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:34006: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:33918: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:34011: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -33923,7 +34016,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:33926: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:34019: 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
@@ -33931,7 +34024,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33934 "configure"
+#line 34027 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33950,16 +34043,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33956: \$? = $ac_status" >&5
+  echo "$as_me:34049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33962: \$? = $ac_status" >&5
+  echo "$as_me:34055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -33970,13 +34063,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33973: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:34066: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:33979: checking for XCurses library" >&5
+echo "$as_me:34072: 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
@@ -33984,7 +34077,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33987 "configure"
+#line 34080 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -33999,16 +34092,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34005: \$? = $ac_status" >&5
+  echo "$as_me:34098: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34011: \$? = $ac_status" >&5
+  echo "$as_me:34104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -34019,7 +34112,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:34022: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:34115: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -34038,14 +34131,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:34041: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:34134: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:34048: checking if we can include termio.h with curses" >&5
+echo "$as_me:34141: 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
@@ -34055,7 +34148,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 34058 "configure"
+#line 34151 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -34069,16 +34162,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34075: \$? = $ac_status" >&5
+  echo "$as_me:34168: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34081: \$? = $ac_status" >&5
+  echo "$as_me:34174: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -34091,7 +34184,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:34094: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:34187: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -34106,23 +34199,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:34109: checking for $ac_header" >&5
+echo "$as_me:34202: 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 34115 "configure"
+#line 34208 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34119: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34212: \"$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:34125: \$? = $ac_status" >&5
+  echo "$as_me:34218: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34141,7 +34234,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34144: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34237: 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
@@ -34151,7 +34244,7 @@ EOF
 fi
 done
 
-echo "$as_me:34154: checking if curses supports alternate-character set" >&5
+echo "$as_me:34247: 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
@@ -34160,7 +34253,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 34163 "configure"
+#line 34256 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34174,16 +34267,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34180: \$? = $ac_status" >&5
+  echo "$as_me:34273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34186: \$? = $ac_status" >&5
+  echo "$as_me:34279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -34197,20 +34290,20 @@ done
 
 fi
 
-echo "$as_me:34200: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:34293: 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:34206: checking if curses supports fancy attributes" >&5
+echo "$as_me:34299: 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 34213 "configure"
+#line 34306 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34228,16 +34321,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34234: \$? = $ac_status" >&5
+  echo "$as_me:34327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34240: \$? = $ac_status" >&5
+  echo "$as_me:34333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -34249,13 +34342,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34252: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:34345: 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:34258: checking for function curses_version" >&5
+echo "$as_me:34351: 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
@@ -34265,7 +34358,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 34268 "configure"
+#line 34361 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34278,15 +34371,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:34281: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34284: \$? = $ac_status" >&5
+  echo "$as_me:34377: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:34286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34289: \$? = $ac_status" >&5
+  echo "$as_me:34382: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -34301,21 +34394,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:34304: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:34397: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:34311: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:34404: 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 34318 "configure"
+#line 34411 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34334,16 +34427,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34340: \$? = $ac_status" >&5
+  echo "$as_me:34433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34346: \$? = $ac_status" >&5
+  echo "$as_me:34439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -34355,10 +34448,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34358: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:34451: 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:34361: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:34454: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -34367,14 +34460,14 @@ EOF
 fi
 fi
 
-echo "$as_me:34370: checking if curses supports color attributes" >&5
+echo "$as_me:34463: 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 34377 "configure"
+#line 34470 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34394,16 +34487,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34400: \$? = $ac_status" >&5
+  echo "$as_me:34493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34406: \$? = $ac_status" >&5
+  echo "$as_me:34499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -34415,7 +34508,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34418: result: $cf_cv_color_curses" >&5
+echo "$as_me:34511: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -34435,23 +34528,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:34438: checking for $ac_header" >&5
+echo "$as_me:34531: 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 34444 "configure"
+#line 34537 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34448: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34541: \"$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:34454: \$? = $ac_status" >&5
+  echo "$as_me:34547: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34470,7 +34563,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34473: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34566: 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
@@ -34485,23 +34578,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:34488: checking for $ac_header" >&5
+echo "$as_me:34581: 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 34494 "configure"
+#line 34587 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34498: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34591: \"$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:34504: \$? = $ac_status" >&5
+  echo "$as_me:34597: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34520,7 +34613,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34523: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34616: 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
@@ -34538,10 +34631,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:34541: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:34634: 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 34544 "configure"
+#line 34637 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -34553,16 +34646,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34559: \$? = $ac_status" >&5
+  echo "$as_me:34652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34565: \$? = $ac_status" >&5
+  echo "$as_me:34658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -34570,7 +34663,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 34573 "configure"
+#line 34666 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -34584,16 +34677,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34587: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34590: \$? = $ac_status" >&5
+  echo "$as_me:34683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34596: \$? = $ac_status" >&5
+  echo "$as_me:34689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -34608,12 +34701,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:34611: result: $termios_bad" >&5
+	echo "$as_me:34704: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:34616: checking declaration of size-change" >&5
+echo "$as_me:34709: 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
@@ -34628,7 +34721,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 34631 "configure"
+#line 34724 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -34672,16 +34765,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34678: \$? = $ac_status" >&5
+  echo "$as_me:34771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34684: \$? = $ac_status" >&5
+  echo "$as_me:34777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -34700,7 +34793,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:34703: result: $cf_cv_sizechange" >&5
+echo "$as_me:34796: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -34717,14 +34810,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:34720: checking if ttytype is declared in curses library" >&5
+echo "$as_me:34813: 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 34727 "configure"
+#line 34820 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -34736,16 +34829,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34742: \$? = $ac_status" >&5
+  echo "$as_me:34835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34748: \$? = $ac_status" >&5
+  echo "$as_me:34841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -34757,7 +34850,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34760: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:34853: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
@@ -34765,14 +34858,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:34768: checking if curses supports wide characters" >&5
+echo "$as_me:34861: 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 34775 "configure"
+#line 34868 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34791,16 +34884,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34797: \$? = $ac_status" >&5
+  echo "$as_me:34890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34803: \$? = $ac_status" >&5
+  echo "$as_me:34896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -34811,7 +34904,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:34814: result: $cf_cv_widec_curses" >&5
+echo "$as_me:34907: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -34820,14 +34913,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:34823: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:34916: 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 34830 "configure"
+#line 34923 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34841,23 +34934,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34847: \$? = $ac_status" >&5
+  echo "$as_me:34940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34853: \$? = $ac_status" >&5
+  echo "$as_me:34946: \$? = $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 34860 "configure"
+#line 34953 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34872,16 +34965,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34878: \$? = $ac_status" >&5
+  echo "$as_me:34971: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34884: \$? = $ac_status" >&5
+  echo "$as_me:34977: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -34893,7 +34986,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:34896: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:34989: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -34914,14 +35007,14 @@ fi
 
 	fi
 
-echo "$as_me:34917: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:35010: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34924 "configure"
+#line 35017 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34938,23 +35031,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34944: \$? = $ac_status" >&5
+  echo "$as_me:35037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34950: \$? = $ac_status" >&5
+  echo "$as_me:35043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 34957 "configure"
+#line 35050 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -34972,16 +35065,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34978: \$? = $ac_status" >&5
+  echo "$as_me:35071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34984: \$? = $ac_status" >&5
+  echo "$as_me:35077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -34993,11 +35086,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:34996: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:35089: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:35000: checking for term.h" >&5
+echo "$as_me:35093: 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
@@ -35010,7 +35103,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 35013 "configure"
+#line 35106 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -35024,16 +35117,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35030: \$? = $ac_status" >&5
+  echo "$as_me:35123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35036: \$? = $ac_status" >&5
+  echo "$as_me:35129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -35046,7 +35139,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:35049: result: $cf_cv_term_header" >&5
+echo "$as_me:35142: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -35097,10 +35190,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:35100: checking for ${cf_func}" >&5
+	echo "$as_me:35193: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:35103: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:35196: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35109,7 +35202,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 35112 "configure"
+#line 35205 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -35143,16 +35236,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35149: \$? = $ac_status" >&5
+  echo "$as_me:35242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35155: \$? = $ac_status" >&5
+  echo "$as_me:35248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -35168,7 +35261,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:35171: result: $cf_result" >&5
+	echo "$as_me:35264: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -35184,13 +35277,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35187: checking for $ac_func" >&5
+echo "$as_me:35280: 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 35193 "configure"
+#line 35286 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -35221,16 +35314,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35227: \$? = $ac_status" >&5
+  echo "$as_me:35320: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35233: \$? = $ac_status" >&5
+  echo "$as_me:35326: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35240,7 +35333,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35243: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35336: 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
@@ -35254,12 +35347,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:35257: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:35350: 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:35262: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:35355: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35267,7 +35360,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:35270: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:35363: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -35372,7 +35465,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:35375: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:35468: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -35548,7 +35641,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:35551: error: ambiguous option: $1
+    { { echo "$as_me:35644: 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;}
@@ -35567,7 +35660,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:35570: error: unrecognized option: $1
+  -*) { { echo "$as_me:35663: 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;}
@@ -35620,7 +35713,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:35623: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:35716: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -35939,7 +36032,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:35942: creating $ac_file" >&5
+    { echo "$as_me:36035: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -35957,7 +36050,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:35960: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:36053: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -35970,7 +36063,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:35973: error: cannot find input file: $f" >&5
+           { { echo "$as_me:36066: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -36036,7 +36129,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:36039: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:36132: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -36047,7 +36140,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:36050: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:36143: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -36060,7 +36153,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:36063: error: cannot find input file: $f" >&5
+           { { echo "$as_me:36156: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -36178,7 +36271,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:36181: $ac_file is unchanged" >&5
+      { echo "$as_me:36274: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 9eee61d1..086c0de4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.183 2009/01/02 01:13:02 tom Exp $
+dnl $LynxId: configure.in,v 1.184 2009/01/03 16:01:26 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -536,6 +536,8 @@ slang)
 	;;
 esac
 
+CF_CURSES_CHTYPE
+
 AC_MSG_CHECKING(if you want the wide-curses features)
 CF_ARG_ENABLE(widec, 
 [  --enable-widec          enable wide-curses features], 
diff --git a/src/HTAlert.c b/src/HTAlert.c
index a5fbf13e..e0e3a581 100644
--- a/src/HTAlert.c
+++ b/src/HTAlert.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAlert.c,v 1.82 2008/09/06 14:35:56 tom Exp $
+ * $LynxId: HTAlert.c,v 1.83 2009/01/03 00:43:04 tom Exp $
  *
  *	Displaying messages and getting input for Lynx Browser
  *	==========================================================
@@ -551,7 +551,7 @@ BOOL confirm_post_resub(const char *address,
     char buf[240];
     char *temp = NULL;
     BOOL res;
-    size_t maxlen = LYcolLimit - 5;
+    size_t maxlen = (size_t) (LYcolLimit - 5);
 
     if (!address) {
 	return (NO);
@@ -864,11 +864,11 @@ BOOL HTConfirmCookie(domain_entry * de, const char *server,
 	space_free = (LYcolLimit
 		      - (LYstrCells(prompt)
 			 - 10)	/* %s and %.*s and %.*s chars */
-		      -strlen(server));
+		      - (int) strlen(server));
 	if (space_free < 0)
 	    space_free = 0;
-	namelen = strlen(name);
-	valuelen = strlen(value);
+	namelen =  (int) strlen(name);
+	valuelen =  (int) strlen(value);
 	if ((namelen + valuelen) > space_free) {
 	    /*
 	     * Argh...  there isn't enough space on our single line for
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 77300aa1..77d29f23 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.136 2008/09/10 19:48:30 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.137 2009/01/03 00:36:42 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -260,7 +260,7 @@ static char *attr_to_string(int code)
     int bold = (pair != 0 && (code & A_BOLD) != 0);
 
     if (bold)
-	code &= ~A_BOLD;
+	code &= (int) ~A_BOLD;
 
     *result = 0;
     for (i = 0; i < TABLESIZE(Mono_Attrs); i++) {
@@ -337,12 +337,25 @@ void LYbox(WINDOW * win, BOOLEAN formfield GCC_UNUSED)
      */
     LynxWChangeStyle(win, s_menu_frame, STACK_ON);
 #ifdef HAVE_WBORDER
-    if (!boxvert || !boxhori)
-	box(win, boxvert, boxhori);
-    else if (boxvert == '*' || boxhori == '*')
-	wborder(win, boxvert, boxvert, boxhori, boxhori, '*', '*', '*', '*');
-    else
-	wborder(win, boxvert, boxvert, boxhori, boxhori, '/', '\\', '\\', '/');
+    if (!boxvert || !boxhori) {
+	box(win,
+	    (chtype) boxvert,
+	    (chtype) boxhori);
+    } else if (boxvert == '*' || boxhori == '*') {
+	wborder(win,
+		(chtype) boxvert,
+		(chtype) boxvert,
+		(chtype) boxhori,
+		(chtype) boxhori,
+		'*', '*', '*', '*');
+    } else {
+	wborder(win,
+		(chtype) boxvert,
+		(chtype) boxvert,
+		(chtype) boxhori,
+		(chtype) boxhori,
+		'/', '\\', '\\', '/');
+    }
 #else
     box(win, boxvert, boxhori);
 #endif
@@ -652,7 +665,7 @@ static int encode_color_attr(int color_attr)
 
 static int decode_mono_code(int mono_code)
 {
-    int result = 0;
+    unsigned result = 0;
 
     if (mono_code & 1)
 	result |= A_BOLD;
@@ -661,7 +674,7 @@ static int decode_mono_code(int mono_code)
     if (mono_code & 4)
 	result |= A_UNDERLINE;
 
-    return result;
+    return (int) result;
 }
 
 /*
@@ -690,7 +703,7 @@ char *LYgetTableString(int code)
     int mask = decode_mono_code(code);
     int second = encode_color_attr(mask);
     int pair = PAIR_NUMBER(second);
-    int mono = mask & A_ATTRIBUTES;
+    int mono = (int) (mask & A_ATTRIBUTES);
     int fg = lynx_color_pairs[pair].fg;
     int bg = lynx_color_pairs[pair].bg;
     unsigned n;
@@ -820,7 +833,7 @@ static void lynx_init_colors(void)
 	lynx_color_cfg[0].bg = default_bg;
 
 	for (n = 0; n < TABLESIZE(lynx_color_cfg); n++) {
-	    lynx_init_color_pair(n);
+	    lynx_init_color_pair((int) n);
 	}
     } else if (LYShowColor != SHOW_COLOR_NEVER) {
 	LYShowColor = SHOW_COLOR_OFF;
@@ -1699,18 +1712,17 @@ void LYsubAttr(int a)
  * color to a uniform width in the popup-menu.
  */
 #ifndef USE_SLANG
-void LYpaddstr(WINDOW * the_window, int width,
-	       const char *the_string)
+void LYpaddstr(WINDOW * the_window, int width, const char *the_string)
 {
     int y, x;
-    int actual = strlen(the_string);
+    int actual = (int) strlen(the_string);
 
     getyx(the_window, y, x);
     if (width + x > LYcolLimit)
 	width = LYcolLimit - x;
     if (actual > width)
 	actual = width;
-    LYwaddnstr(the_window, the_string, actual);
+    LYwaddnstr(the_window, the_string, (size_t) actual);
     width -= actual;
     while (width-- > 0)
 	waddstr(the_window, " ");
@@ -1736,7 +1748,7 @@ void LYsubwindow(WINDOW * param)
 	{
 	    long b = LYgetattrs(my_subwindow);
 
-	    wbkgd(my_subwindow, b | ' ');
+	    wbkgd(my_subwindow, (chtype) (b | ' '));
 	}
 	LynxWChangeStyle(my_subwindow, s_menu_bg, STACK_OFF);
 #elif defined(HAVE_GETBKGD)	/* not defined in ncurses 1.8.7 */
@@ -1949,7 +1961,7 @@ int LYstrExtent(const char *string, int len, int maxCells)
     int used;
 
     if (len < 0)
-	used = strlen(string);
+	used = (int) strlen(string);
     else
 	used = len;
 
@@ -2010,7 +2022,7 @@ int LYstrExtent2(const char *string, int len)
  */
 int LYstrCells(const char *string)
 {
-    return LYstrExtent2(string, strlen(string));
+    return LYstrExtent2(string, (int) strlen(string));
 }
 
 #ifdef VMS
@@ -2525,7 +2537,7 @@ void LYnormalColor(void)
 	int color = displayStyles[DSTYLE_NORMAL].color;
 
 	if (color >= 0) {
-	    wbkgd(LYwin, color | ' ');
+	    wbkgd(LYwin, (chtype) (color | ' '));
 	    LYrefresh();
 	}
     }
@@ -2859,19 +2871,20 @@ static void make_blink_boldbg(void)
  */
 long LYgetattrs(WINDOW * win)
 {
+    long result;
 #if ( defined(HAVE_GETATTRS) && ( !defined(NCURSES_VERSION_MAJOR) || NCURSES_VERSION_MAJOR < 5 ) )
-    long result = 0;
 
     result = getattrs(win);
 #else
-    attr_t result = 0;
+    attr_t attrs = 0;
     short pair = 0;
 
     /*
      * FIXME: this ignores the color-pair, which for most implementations is
      * not stored in the attribute value.
      */
-    wattr_get(win, &result, &pair, NULL);
+    wattr_get(win, &attrs, &pair, NULL);
+    result = (long) attrs;
 #endif
     return result;
 }
diff --git a/src/LYCurses.h b/src/LYCurses.h
index 41dbf648..18a611fa 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.h,v 1.77 2007/07/02 00:09:00 tom Exp $ */
+/* $LynxId: LYCurses.h,v 1.79 2009/01/03 16:55:08 tom Exp $ */
 #ifndef LYCURSES_H
 #define LYCURSES_H
 
@@ -50,6 +50,7 @@
 
 #ifdef USE_SLANG
 #include <slang.h>
+typedef unsigned long chtype;
 
 #undef WINDOW
 typedef struct {
@@ -116,8 +117,23 @@ typedef struct {
 
 #ifdef VMS
 #define FANCY_CURSES
+
 #endif /* VMS */
 
+#ifndef HAVE_TYPE_CHTYPE
+
+#ifdef __PDCURSES__
+#define HAVE_TYPE_CHTYPE 1
+#endif
+
+#if defined(_VMS_CURSES) || defined(VMS)
+typedef char chtype;
+
+#define HAVE_TYPE_CHTYPE 1
+#endif
+
+#endif /* ! HAVE_TYPE_CHTYPE */
+
 /*
  *	CR may be defined before the curses.h include occurs.
  *	There is a conflict between the termcap char *CR and the define.
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index 8e7baecb..ddad2284 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.66 2009/01/01 23:09:11 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.67 2009/01/03 02:06:45 Paul.Gilmartin Exp $ */
 #include <HTUtils.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
@@ -1171,16 +1171,17 @@ char *LYKeycodeToString(int c,
     }
 
     if (!named) {
-	if (c > ' '
-	    && c < 0177)
+	if (c <= 0377
+	    && TOASCII(c) > TOASCII(' ')
+	    && TOASCII(c) < 0177)
 	    sprintf(buf, "%c", c);
 	else if (upper8
-		 && c > ' '
+		 && TOASCII(c) > TOASCII(' ')
 		 && c <= 0377
 		 && c <= LYlowest_eightbit[current_char_set])
 	    sprintf(buf, "%c", c);
-	else if (c < ' ')
-	    sprintf(buf, "^%c", c | 0100);
+	else if (TOASCII(c) < TOASCII(' '))
+	    sprintf(buf, "^%c", FROMASCII(TOASCII(c) | 0100));
 	else if (c >= 0400)
 	    sprintf(buf, "key-0x%x", c);
 	else
diff --git a/src/LYMail.c b/src/LYMail.c
index 0354740e..1aea8ea0 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -1,3 +1,6 @@
+/*
+ * $LynxId: LYMail.c,v 1.71 2009/01/03 00:39:50 tom Exp $
+ */
 #include <HTUtils.h>
 #include <HTParse.h>
 #include <LYGlobalDefs.h>
@@ -83,7 +86,7 @@ static void extract_field(char **dst,
 			  char *src,
 			  const char *keyword)
 {
-    int len = strlen(keyword);
+    int len = (int) strlen(keyword);
     char *cp, *cp1;
 
     cp = (src + 1);
@@ -115,7 +118,7 @@ static void extract_subject(char *dst,
 			    char *src)
 {
     const char *keyword = "subject=";
-    int len = strlen(keyword);
+    int len = (int) strlen(keyword);
     char *cp, *cp1;
 
     cp = (src + 1);
@@ -150,7 +153,7 @@ static void extract_body(char **dst,
 			 char *src)
 {
     const char *keyword = "body=";
-    int len = strlen(keyword);
+    int len = (int) strlen(keyword);
     int i;
     char *cp, *cp0, *cp1, *temp = 0;
 
@@ -178,21 +181,21 @@ static void extract_body(char **dst,
 			}
 		    }
 		    i = 0;
-		    len = strlen(cp0);
+		    len = (int) strlen(cp0);
 		    while (len > 78) {
 			HTSprintf(dst, "%.78s\n", &cp0[i]);
 			i += 78;
-			len = strlen(&cp0[i]);
+			len = (int) strlen(&cp0[i]);
 		    }
 		    HTSprintf(dst, "%s\n", &cp0[i]);
 		    cp0 = (cp + 1);
 		}
 		i = 0;
-		len = strlen(cp0);
+		len = (int) strlen(cp0);
 		while (len > 78) {
 		    HTSprintf(dst, "%.78s\n", &cp0[i]);
 		    i += 78;
-		    len = strlen(&cp0[i]);
+		    len = (int) strlen(&cp0[i]);
 		}
 		if (len) {
 		    HTSprintf(dst, "%s\n", &cp0[i]);
@@ -767,25 +770,25 @@ void mailform(const char *mailto_address,
     while ((cp = strchr(mailto_content, '\n')) != NULL) {
 	*cp = '\0';
 	i = 0;
-	len = strlen(mailto_content);
+	len = (int) strlen(mailto_content);
 	while (len > 78) {
 	    strncpy(buf, &mailto_content[i], 78);
 	    buf[78] = '\0';
 	    fprintf(fd, "%s\n", buf);
 	    i += 78;
-	    len = strlen(&mailto_content[i]);
+	    len = (int) strlen(&mailto_content[i]);
 	}
 	fprintf(fd, "%s\n", &mailto_content[i]);
 	mailto_content = (cp + 1);
     }
     i = 0;
-    len = strlen(mailto_content);
+    len = (int) strlen(mailto_content);
     while (len > 78) {
 	strncpy(buf, &mailto_content[i], 78);
 	buf[78] = '\0';
 	fprintf(fd, "%s\n", buf);
 	i += 78;
-	len = strlen(&mailto_content[i]);
+	len = (int) strlen(&mailto_content[i]);
     }
     if (len)
 	fprintf(fd, "%s\n", &mailto_content[i]);
@@ -1668,8 +1671,8 @@ void reply_by_mail(char *mail_address,
 #else
 	    fputs(header, fp);
 #endif
-	    while ((n = fread(buf, 1, sizeof(buf), fd)) != 0) {
-		fwrite(buf, 1, n, fp);
+	    while ((n = (int) fread(buf, 1, sizeof(buf), fd)) != 0) {
+		fwrite(buf, 1, (size_t) n, fp);
 	    }
 #if CAN_PIPE_TO_MAILER
 	    pclose(fp);
diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c
index c24a3cd6..01740684 100644
--- a/src/LYShowInfo.c
+++ b/src/LYShowInfo.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYShowInfo.c,v 1.67 2008/12/25 14:35:50 tom Exp $ */
+/* $LynxId: LYShowInfo.c,v 1.68 2009/01/03 00:37:51 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFile.h>
 #include <HTParse.h>
@@ -77,7 +77,7 @@ static void dt_String(FILE *fp,
     StrAllocCopy(the_label, label);
     StrAllocCopy(the_value, value);
 
-    have = strlen(the_label);
+    have = (int) strlen(the_label);
     need = LYstrExtent(the_label, have, label_columns);
 
     LYEntify(&the_label, TRUE);
@@ -148,7 +148,7 @@ int LYShowInfo(DocInfo *doc,
 	(url_type == LYNXEXEC_URL_TYPE ||
 	 url_type == LYNXPROG_URL_TYPE)) {
 	char *last_slash = strrchr(links[doc->link].lname, '/');
-	int next_to_last = strlen(links[doc->link].lname) - 1;
+	int next_to_last = (int) strlen(links[doc->link].lname) - 1;
 
 	if ((last_slash - links[doc->link].lname) == next_to_last) {
 	    links[doc->link].lname[next_to_last] = '\0';
@@ -215,10 +215,10 @@ int LYShowInfo(DocInfo *doc,
 		ADD_SS(gettext("Points to file:"), buf);
 	    }
 #endif
-	    name = HTAA_UidToName(dir_info.st_uid);
+	    name = HTAA_UidToName((int) dir_info.st_uid);
 	    if (*name)
 		ADD_SS(gettext("Name of owner:"), name);
-	    name = HTAA_GidToName(dir_info.st_gid);
+	    name = HTAA_GidToName((int) dir_info.st_gid);
 	    if (*name)
 		ADD_SS(gettext("Group name:"), name);
 	    if (S_ISREG(dir_info.st_mode)) {
diff --git a/src/UCAux.c b/src/UCAux.c
index 89911909..3a8e9158 100644
--- a/src/UCAux.c
+++ b/src/UCAux.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAux.c,v 1.38 2009/01/01 00:42:23 tom Exp $
+ * $LynxId: UCAux.c,v 1.39 2009/01/03 18:46:33 tom Exp $
  */
 #include <HTUtils.h>
 
@@ -342,14 +342,19 @@ void UCSetBoxChars(int cset,
 	 * This is important if we have loaded a font, which would
 	 * confuse curses.
 	 */
-#ifdef EXP_CHARTRANS_AUTOSWITCH
 	/* US-ASCII vs Latin-1 is safe (usually) */
 	if ((cset == US_ASCII
 	     || cset == LATIN1)
 	    && (linedrawing_char_set == US_ASCII
 		|| linedrawing_char_set == LATIN1)) {
+#if (defined(FANCY_CURSES) && defined(A_ALTCHARSET)) || defined(USE_SLANG)
+	    vert_in = 0;
+	    hori_in = 0;
+#else
 	    ;
+#endif
 	}
+#ifdef EXP_CHARTRANS_AUTOSWITCH
 #if defined(NCURSES_VERSION) || defined(HAVE_TIGETSTR)
 	else {
 	    static BOOL first = TRUE;