about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES26
-rw-r--r--INSTALLATION22
-rw-r--r--LYMessages_en.h25
-rw-r--r--WWW/Library/Implementation/HTFTP.c24
-rw-r--r--WWW/Library/Implementation/HTPlain.c4
-rw-r--r--WWW/Library/Implementation/SGML.c11
-rwxr-xr-xconfigure1250
-rw-r--r--configure.in46
-rw-r--r--lynx_help/Lynx_users_guide.html42
-rw-r--r--makefile.in97
-rw-r--r--po/lynx.pot1356
-rw-r--r--src/LYCookie.c4
-rw-r--r--src/LYOptions.c6
-rw-r--r--userdefs.h4
14 files changed, 1471 insertions, 1446 deletions
diff --git a/CHANGES b/CHANGES
index c5eadb6d..979d81a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,27 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+1999-05-25 (2.8.2pre.7)
+* update illustration of forms options menu in Lynx User Guide according to
+  current lynx output -LP
+* old-style options menu:  hot key for "local e(X)ecution links" is now
+  displayed in bold (call addlbl() instead of addstr() like the other options
+  do), adapted from Hiroyuki diffs -LP
+* fix handling of incorrect html in psrc mode.  If a piece of html matched the
+  pattern "<known_tag_name unknown_attr_name any_attr_name>", then styles of
+  internal markup were unbalanced - resulted in cluttered colors -VH
+* comment-out (for release) configure option --enable-libjs -TD
+* change configure script defaults for --enable-persistent-cookies and
+  --enable-alt-bindings to 'yes' -TD
+* add DESTDIR variable to top-level makefile to facilitate packaging releases
+  with compiled-in pathnames -TD
+* further correction to VMS pathname in HFTPLoad.c, to translate /vms/fileserv/
+  to [vms.fileserv], for example.  The wku fileserver gives back a Unix-style
+  listing rather than VMS-style when given a Unix-style CWD, which confuses
+  Lynx into discarding the listing (reported by Andy Harper) -TD
+* modify LYCookies.c to append new items to the end of the list rather than
+  at the start, so cookies will be written and read from .lynx_cookies in
+  consistent order (reported by KED) -TD
 1999-05-24 (2.8.2pre.6)
 * fix for problem reported by LP -VH
   Load an html file with META charset and switch "\" to source mode.  Now press
@@ -25,8 +46,9 @@ Changes since Lynx 2.8 release
 * install COPYING and COPYRIGHT for install-help rule as well as install-doc,
   so we can refer to local copies of those files -TD
 * tweak HTParse trace message -LP
-* minor formatting change for Lynx_users_guide.html -LP
-* correct a few mismatches between variable declarations (char vs BOOLEAN) -LP
+* minor formatting change for Lynx_users_guide.html -Hiroyuki
+* correct a few mismatches between variable declarations (char vs BOOLEAN)
+  (from win32 version by Hiroyuki Senshu <senshu@shonai-cit.ac.jp>).
 1999-05-20 (2.8.2pre.5)
 * correct links to COPYHEADER and COPYING in about_lynx.html, by pointing to
   author's URLs, rather than to files which are not installed anyway -PG
diff --git a/INSTALLATION b/INSTALLATION
index aeafedec..076ae539 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -161,6 +161,10 @@ II. Compile instructions -- UNIX
     order shown by the -help option is different.  See "docs/README.defines"
     for information on defines for which there are no option switches.
 
+  --disable-alt-bindings 		(define EXP_ALT_BINDINGS)
+	Compiles-in an alternative set of line-edit bindings, in addition
+	to the default bindings.
+
   --disable-config-info			(define NO_CONFIG_INFO)
   	Use this option to disable the browsable configuration information
 	(screens that show the result of the configuration script, as well
@@ -272,6 +276,13 @@ II. Compile instructions -- UNIX
 	Turn off code that lets Lynx display parts of a long page while loading
 	it.
 
+  --disable-persistent-cookies		(define EXP_PERSISTENT_COOKIES)
+	Use this option to tell configure whether to compile-in support for
+	saving cookies to a file, for subsequent reuse.  This creates the file
+	specified by the 'COOKIE_FILE' option, or defaults to ".lynx_cookies"
+	in the home directory.  (Currently there is no protection against
+	conflict if several lynx copies are active from the same account).
+
   --disable-trace			(define NO_LYNX_TRACE)
 	Turn off code that lets you trace internal details of Lynx's operation.
 	We recommend that you leave this enabled, since we need this
@@ -282,10 +293,6 @@ II. Compile instructions -- UNIX
 	Compiles-in an alternative list-page, bound to 'A' rather than 'l',
 	which always lists URLs rather than titles.
 
-  --enable-alt-bindings 		(define EXP_ALT_BINDINGS)
-	Compiles-in an alternative set of line-edit bindings, in addition
-	to the default bindings.
-
   --enable-cgi-links			(define LYNXCGI_LINKS)
 	Allows lynx to access a cgi script directly without the need for
 	a http daemon.
@@ -347,13 +354,6 @@ II. Compile instructions -- UNIX
 	Disabled by default, this allows interruption of NSL requests,
 	so that `z' will stop the `look-up' phase of a connection.
 
-  --enable-persistent-cookies		(define EXP_PERSISTENT_COOKIES)
-	Use this option to compile-in support for saving cookies to a file,
-	for subsequent reuse.  This creates the file specified by the
-	'COOKIE_FILE' option, or defaults to ".lynx_cookies" in the home
-	directory.  (Currently there is no protection against conflict
-	if several lynx copies active from the same account).
-
   --enable-prettysrc			(define USE_PSRC)
 	Use this option to compile-in support for colorizing the source
 	view of HTML pages.
diff --git a/LYMessages_en.h b/LYMessages_en.h
index a115a51a..b2910b24 100644
--- a/LYMessages_en.h
+++ b/LYMessages_en.h
@@ -8,18 +8,24 @@
 #define LYMESSAGES_EN_H
 
 /*******************************************************************
- * The following definitions are for status line prompts, messages,
- * or warnings issued by Lynx during program execution.  You can
- * modify them to make them more appropriate for you site, and/or
- * to use other languages.  Links to collections of alternate
- * definitions, developed by the Lynx User Community, are maintained
- * in Lynx links:
+ * The following definitions are for status line prompts, messages, or
+ * warnings issued by Lynx during program execution.  You can modify
+ * them to make them more appropriate for your site.  We recommend that
+ * you extend these definitions to other languages using the gettext
+ * library.  There are also scattered uses of 'gettext()' throughout the
+ * Lynx source, covering all but those messages which (a) are used for
+ * debugging (CTRACE) or (b) are constants used in interaction with
+ * other programs.
+ *
+ * Links to collections of alternate definitions, developed by the Lynx
+ * User Community, are maintained in Lynx links:
  *
  *    http://www.crl.com/~subir/lynx.html
  *
- * You can substitute one of those as LYMessages_en.h, or modify
- * the header inclusion statement in your userdefs.h to include
- * one of those with a different name.
+ * Because the gettext facility is only recently (with release 2.8.2)
+ * introduced, these alternate definitions are given as variants on this
+ * file.  Use them as a starting point to construct a new message
+ * library as needed.  (see po/readme).
  */
 #define ALERT_FORMAT gettext("Alert!: %s")
 #define WELCOME_MSG gettext("Welcome")
@@ -427,6 +433,7 @@
 #define CANNOT_DOWNLOAD_FILE gettext("Unable to download file.")
 #define BUILDING_DIR_LIST gettext("Building directory listing...")
 #define SAVING gettext("Saving...")
+#define COULD_NOT_EDIT_FILE gettext("Could not edit file '%s'.")
 #define COULD_NOT_ACCESS_FILE gettext("Could not access file.")
 #define COULD_NOT_ACCESS_DIR gettext("Could not access directory.")
 #define COULD_NOT_LOAD_DATA gettext("Could not load data.")
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 3a8edbd4..5507254c 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1418,7 +1418,7 @@ PRIVATE void parse_vms_dir_entry ARGS2(
 
     /**  Get rid of blank lines, and information lines.  **/
     /**  Valid lines have the ';' version number token.  **/
-    if (!strlen(line) || (cp=strchr(line, ';')) == NULL) {
+    if (!strlen(line) || (cp = strchr(line, ';')) == NULL) {
 	entry_info->display = FALSE;
 	return;
     }
@@ -1935,12 +1935,12 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2(
 		*first = FALSE;
 		if (!strncmp(entry, "total ", 6) ||
 		    strstr(entry, "not available") != NULL) {
-		    entry_info->display=FALSE;
+		    entry_info->display = FALSE;
 		    return(entry_info);
 		} else if (unsure_type) {
 		    /* this isn't really a unix server! */
 		    server_type = GENERIC_SERVER;
-		    entry_info->display=FALSE;
+		    entry_info->display = FALSE;
 		    return(entry_info);
 		}
 	    }
@@ -1982,7 +1982,7 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2(
 
 	    if (!strcmp(entry_info->filename,"..") ||
 		!strcmp(entry_info->filename,"."))
-		entry_info->display=FALSE;
+		entry_info->display = FALSE;
 	    /*
 	    **	Goto the bottom and get real type.
 	    */
@@ -2576,7 +2576,6 @@ PUBLIC int HTFTPLoad ARGS4(
     int status;
     int retry;			/* How many times tried? */
     HTFormat format;
-    char command[LINE_LENGTH+1];
 
 
     /* set use_list to NOT since we don't know what kind of server
@@ -2626,6 +2625,7 @@ PUBLIC int HTFTPLoad ARGS4(
 /*	Tell the server to be passive
 */
 	{
+	    char command[LINE_LENGTH+1];
 	    char *p;
 	    int reply, h0, h1, h2, h3, p0, p1;	/* Parts of reply */
 	    int status;
@@ -3014,19 +3014,19 @@ PUBLIC int HTFTPLoad ARGS4(
 	    /** Otherwise, go to appropriate directory and doctor filename **/
 	    if (!strncmp(filename, "/~", 2))
 		filename += 2;
-	    CTRACE(tfp, "check '%s' to translate x/y/ to x[y]\n", filename);
+	    CTRACE(tfp, "check '%s' to translate x/y/ to [.x.y]\n", filename);
 	    if (!included_device &&
 		(cp = strchr(filename, '/')) != NULL &&
-		(cp1 = strrchr(cp, '/')) != NULL && cp != cp1) {
+		(cp1 = strrchr(cp, '/')) != NULL &&
+		(cp1 - cp) > 1) {
 		char *tmp = 0;
 
-		StrAllocCopy(tmp, cp+1);
-		tmp[(cp1-cp)] = 0;
+		HTSprintf0(&tmp, "[.%.*s]", cp1-cp-1, cp+1);
 
-		CTRACE(tfp, "change command '%s'\n", command);
-		while ((cp2 = strrchr(command, '/')) != NULL)
+		CTRACE(tfp, "change path '%s'\n", tmp);
+		while ((cp2 = strrchr(tmp, '/')) != NULL)
 		    *cp2 = '.';
-		CTRACE(tfp, "...to  command '%s'\n", command);
+		CTRACE(tfp, "...to  path '%s'\n", tmp);
 
 		status = send_cwd(tmp);
 		FREE(tmp);
diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c
index c49d14c2..a1a8a136 100644
--- a/WWW/Library/Implementation/HTPlain.c
+++ b/WWW/Library/Implementation/HTPlain.c
@@ -214,7 +214,7 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
     CONST char * p;
     CONST char * e = s+l;
     char c;
-    unsigned char c_unsign;
+    unsigned c_unsign;
     BOOL chk;
     UCode_t code, uck = -1;
     char saved_char_in = '\0';
@@ -534,7 +534,7 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
 	   **  make it safe and output that now. - FM
 	   */
 	   } else if ((c_unsign > 0 &&
-		      c_unsign < LYlowest_eightbit[me->outUCLYhndl]) ||
+		      (int) c_unsign < LYlowest_eightbit[me->outUCLYhndl]) ||
 		      (me->T.trans_from_uni && !HTPassEightBitRaw)) {
 	    /*
 	    **	If we do not have the "7-bit approximations" as our
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 4ce8dabb..7d436284 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -3190,8 +3190,15 @@ top1:
 	    context->state = S_equals;
 	    break;
 	}
+#ifdef USE_PSRC
+	/* we are here because this char seemed the beginning of attrname */
+	if (psrc_view && context->current_attribute_number == INVALID) {
+	    PSRCSTOP(badattr);
+	    PUTC(' ');
+	}
+#endif
 	HTChunkPutc(string, c);
-	context->state = S_attr;		/* Get next attribute */
+	context->state = S_attr; /* Get next attribute */
 	break;
 
     case S_equals:		/* After attr = */
@@ -3202,7 +3209,7 @@ top1:
 #ifdef USE_PSRC
 	    if (psrc_view) {
 		if (context->current_tag != context->unknown_tag)
-    		    PSRCSTOP(tag);
+		    PSRCSTOP(tag);
 		else
 		    PSRCSTOP(badtag);
 		PSRCSTART(abracket);
diff --git a/configure b/configure
index 34d8ee7f..d1ee8fe9 100755
--- a/configure
+++ b/configure
@@ -208,17 +208,15 @@ Experimental Options:
   --disable-forms-options disable experimental forms-based options
   --disable-menu-options  disable old-style option menu
   --enable-addrlist-page  use experimental address-list page
-  --enable-alt-bindings   use experimental line-edit bindings
   --enable-color-style    use optional/experimental color style
   --enable-default-colors enable use of default-colors (ncurses/slang)
   --enable-kbd-layout     use experimental keyboard-layout support
+  --enable-prettysrc      colorize HTML source
 EOF
 cat <<EOF
-  --enable-libjs          use experimental JavaScript support (Mozilla libjs)
-  --enable-persistent-cookies  use experimental persistent-cookie support
-  --enable-prettysrc      colorize HTML source
   --enable-source-cache   cache HTML source for parse mode changes
 Miscellaneous Options:
+  --disable-alt-bindings  disable alternative line-edit bindings
   --disable-extended-dtd  disable extended HTML DTD logic
   --disable-partial       use partial-display logic
   --enable-externs        use external commands
@@ -226,11 +224,12 @@ Miscellaneous Options:
   --enable-cgi-links      support cgi links w/o a http daemon
   --enable-exec-links     allow lynx to execute programs accessed via a link
   --enable-exec-scripts   allow lynx to execute programs inferred from a link
-EOF
-cat <<EOF
   --enable-internal-links handle following links to same doc differently
   --enable-nsl-fork       fork NSL requests, allowing them to be aborted
+EOF
+cat <<EOF
   --enable-syslog         log URL requests via syslog
+  --disable-persistent-cookies  disable persistent-cookie support
   --enable-underlines     underline links rather than using boldface
   --enable-gzip-help      install gzip'ed help files
   --with-zlib             use zlib for decompression of some gzip files
@@ -240,9 +239,9 @@ cat <<EOF
   --disable-ftp           disable FTP logic
 Directory Editor Options:
   --disable-dired          disable optional directory-editor, DirEd
+  --disable-dired-archive  disable dearchiving commands
 EOF
 cat <<EOF
-  --disable-dired-archive  disable dearchiving commands
   --disable-dired-override disable private keymaps
   --disable-dired-permit  disable chmod/attrib commands
   --disable-dired-xpermit disable chmod/attrib commands
@@ -621,7 +620,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:625: checking host system type" >&5
+echo "configure:624: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -676,7 +675,7 @@ ALL_LINGUAS="de es fr it ko nl no pl pt sl sv"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:680: checking for $ac_word" >&5
+echo "configure:679: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -706,7 +705,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:710: checking for $ac_word" >&5
+echo "configure:709: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -757,7 +756,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:761: checking for $ac_word" >&5
+echo "configure:760: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -789,7 +788,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:792: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -800,12 +799,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 804 "configure"
+#line 803 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -831,12 +830,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:835: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:834: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:840: checking whether we are using GNU C" >&5
+echo "configure:839: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -845,7 +844,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -864,7 +863,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:868: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:867: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -896,7 +895,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:900: checking how to run the C preprocessor" >&5
+echo "configure:899: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -911,13 +910,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 915 "configure"
+#line 914 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -928,13 +927,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 932 "configure"
+#line 931 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -945,13 +944,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 949 "configure"
+#line 948 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -978,7 +977,7 @@ echo "$ac_t""$CPP" 1>&6
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:982: checking for $ac_word" >&5
+echo "configure:981: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1006,7 +1005,7 @@ else
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1010: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1009: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1044,7 +1043,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1048: checking for a BSD compatible install" >&5
+echo "configure:1047: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1101,7 +1100,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1105: checking for $ac_word" >&5
+echo "configure:1104: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1132,9 +1131,9 @@ done
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1136: checking for AIX" >&5
+echo "configure:1135: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1138 "configure"
+#line 1137 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1156,7 +1155,7 @@ rm -f conftest*
 
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1160: checking for POSIXized ISC" >&5
+echo "configure:1159: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1182,7 +1181,7 @@ fi
 
 
 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:1186: checking if you want to see long compiling messages" >&5
+echo "configure:1185: checking if you want to see long compiling messages" >&5
 
 # Check whether --enable-echo or --disable-echo was given.
 if test "${enable_echo+set}" = set; then
@@ -1230,7 +1229,7 @@ fi
 
 
 echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6
-echo "configure:1234: checking if you want to check memory-leaks" >&5
+echo "configure:1233: checking if you want to check memory-leaks" >&5
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
 if test "${enable_find_leaks+set}" = set; then
@@ -1254,7 +1253,7 @@ EOF
 
 
 echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6
-echo "configure:1258: checking if you want to enable debug-code" >&5
+echo "configure:1257: checking if you want to enable debug-code" >&5
 
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -1296,7 +1295,7 @@ else
 fi
 
 echo $ac_n "checking if you want to enable lynx trace code *recommended* ""... $ac_c" 1>&6
-echo "configure:1300: checking if you want to enable lynx trace code *recommended* " >&5
+echo "configure:1299: checking if you want to enable lynx trace code *recommended* " >&5
 
 # Check whether --enable-trace or --disable-trace was given.
 if test "${enable_trace+set}" = set; then
@@ -1322,7 +1321,7 @@ EOF
 if test -n "$GCC"
 then
 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:1326: checking if you want to turn on gcc warnings" >&5
+echo "configure:1325: checking if you want to turn on gcc warnings" >&5
 
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
@@ -1362,9 +1361,9 @@ EOF
 if test -n "$GCC"
 then
 	echo "checking for gcc __attribute__ directives" 1>&6
-echo "configure:1366: checking for gcc __attribute__ directives" >&5
+echo "configure:1365: checking for gcc __attribute__ directives" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 1368 "configure"
+#line 1367 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -1402,7 +1401,7 @@ EOF
 EOF
 			;;
 		esac
-		if { (eval echo configure:1406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
 			cat conftest.h >>confdefs.h
 #		else
@@ -1419,11 +1418,11 @@ fi
 if test -n "$GCC"
 then
 		cat > conftest.$ac_ext <<EOF
-#line 1423 "configure"
+#line 1422 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 		echo "checking for gcc warning options" 1>&6
-echo "configure:1427: checking for gcc warning options" >&5
+echo "configure:1426: checking for gcc warning options" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
 	cf_warn_CONST=""
@@ -1441,7 +1440,7 @@ echo "configure:1427: checking for gcc warning options" >&5
 		Wstrict-prototypes $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo configure:1445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:1444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
@@ -1459,12 +1458,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1463: checking for ANSI C header files" >&5
+echo "configure:1462: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1468 "configure"
+#line 1467 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1472,7 +1471,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1489,7 +1488,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1493 "configure"
+#line 1492 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1507,7 +1506,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 <<EOF
-#line 1511 "configure"
+#line 1510 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1528,7 +1527,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1531 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1539,7 +1538,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1563,12 +1562,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1567: checking for working const" >&5
+echo "configure:1566: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1572 "configure"
+#line 1571 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1617,7 +1616,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1638,21 +1637,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1642: checking for inline" >&5
+echo "configure:1641: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1649 "configure"
+#line 1648 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1678,12 +1677,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1682: checking for off_t" >&5
+echo "configure:1681: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1687 "configure"
+#line 1686 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1711,12 +1710,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1715: checking for size_t" >&5
+echo "configure:1714: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1720 "configure"
+#line 1719 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1746,19 +1745,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1750: checking for working alloca.h" >&5
+echo "configure:1749: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1755 "configure"
+#line 1754 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1779,12 +1778,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1783: checking for alloca" >&5
+echo "configure:1782: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1788 "configure"
+#line 1787 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1812,7 +1811,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1844,12 +1843,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1848: checking whether alloca needs Cray hooks" >&5
+echo "configure:1847: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1853 "configure"
+#line 1852 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1874,12 +1873,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1878: checking for $ac_func" >&5
+echo "configure:1877: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1883 "configure"
+#line 1882 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1902,7 +1901,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1929,7 +1928,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1933: checking stack direction for C alloca" >&5
+echo "configure:1932: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1937,7 +1936,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 1941 "configure"
+#line 1940 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1956,7 +1955,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -1981,17 +1980,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1985: checking for $ac_hdr" >&5
+echo "configure:1984: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1990 "configure"
+#line 1989 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2020,12 +2019,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2024: checking for $ac_func" >&5
+echo "configure:2023: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2029 "configure"
+#line 2028 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2048,7 +2047,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2073,7 +2072,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2077: checking for working mmap" >&5
+echo "configure:2076: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2081,7 +2080,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2085 "configure"
+#line 2084 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2221,7 +2220,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2249,17 +2248,17 @@ unistd.h values.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2253: checking for $ac_hdr" >&5
+echo "configure:2252: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2258 "configure"
+#line 2257 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2289,12 +2288,12 @@ done
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2293: checking for $ac_func" >&5
+echo "configure:2292: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2298 "configure"
+#line 2297 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2317,7 +2316,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2346,12 +2345,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2350: checking for $ac_func" >&5
+echo "configure:2349: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2355 "configure"
+#line 2354 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2374,7 +2373,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2408,19 +2407,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2412: checking for LC_MESSAGES" >&5
+echo "configure:2411: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2417 "configure"
+#line 2416 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2441,7 +2440,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2445: checking whether NLS is requested" >&5
+echo "configure:2444: checking whether NLS is requested" >&5
         
 # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
@@ -2462,7 +2461,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2466: checking whether included gettext is requested" >&5
+echo "configure:2465: checking whether included gettext is requested" >&5
       
 # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
@@ -2482,17 +2481,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2486: checking for libintl.h" >&5
+echo "configure:2485: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2491 "configure"
+#line 2490 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2509,19 +2508,19 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2513: checking for gettext in libc" >&5
+echo "configure:2512: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2518 "configure"
+#line 2517 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -2537,7 +2536,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2541: checking for bindtextdomain in -lintl" >&5
+echo "configure:2540: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2545,7 +2544,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2549 "configure"
+#line 2548 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2556,7 +2555,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2572,19 +2571,19 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2576: checking for gettext in libintl" >&5
+echo "configure:2575: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2581 "configure"
+#line 2580 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -2612,7 +2611,7 @@ EOF
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2616: checking for $ac_word" >&5
+echo "configure:2615: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2646,12 +2645,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2650: checking for $ac_func" >&5
+echo "configure:2649: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
+#line 2654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2674,7 +2673,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2701,7 +2700,7 @@ done
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2705: checking for $ac_word" >&5
+echo "configure:2704: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2737,7 +2736,7 @@ fi
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2741: checking for $ac_word" >&5
+echo "configure:2740: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2769,7 +2768,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 2773 "configure"
+#line 2772 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2777,7 +2776,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -2800,7 +2799,7 @@ fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2804: checking whether catgets can be used" >&5
+echo "configure:2803: checking whether catgets can be used" >&5
 	  
 # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
@@ -2814,7 +2813,7 @@ fi
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2818: checking for main in -li" >&5
+echo "configure:2817: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2822,14 +2821,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2826 "configure"
+#line 2825 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2857,12 +2856,12 @@ else
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2861: checking for catgets" >&5
+echo "configure:2860: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2866 "configure"
+#line 2865 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -2885,7 +2884,7 @@ catgets();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -2907,7 +2906,7 @@ EOF
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2911: checking for $ac_word" >&5
+echo "configure:2910: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2943,7 +2942,7 @@ fi
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2947: checking for $ac_word" >&5
+echo "configure:2946: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2980,7 +2979,7 @@ fi
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2984: checking for $ac_word" >&5
+echo "configure:2983: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3015,7 +3014,7 @@ fi
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3019: checking for $ac_word" >&5
+echo "configure:3018: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3073,7 +3072,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3077: checking for $ac_word" >&5
+echo "configure:3076: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3107,7 +3106,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3111: checking for $ac_word" >&5
+echo "configure:3110: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3143,7 +3142,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3147: checking for $ac_word" >&5
+echo "configure:3146: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3233,7 +3232,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3237: checking for catalogs to be installed" >&5
+echo "configure:3236: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -3262,17 +3261,17 @@ echo "configure:3237: checking for catalogs to be installed" >&5
      if test "$CATOBJEXT" = ".cat"; then
        ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3266: checking for linux/version.h" >&5
+echo "configure:3265: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3271 "configure"
+#line 3270 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3384,7 +3383,7 @@ SUB_MAKEFILE=
 use_our_messages=no
 if test -d $srcdir/po ; then
 echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6
-echo "configure:3388: checking if we should use included message-library" >&5
+echo "configure:3387: checking if we should use included message-library" >&5
 	
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
 if test "${enable_included_msgs+set}" = set; then
@@ -3420,17 +3419,17 @@ elif test "$USE_NLS" = yes ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3424: checking for $ac_hdr" >&5
+echo "configure:3423: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3429 "configure"
+#line 3428 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3500,7 +3499,7 @@ EOF
 fi
 
 echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6
-echo "configure:3504: checking if you want full utility pathnames" >&5
+echo "configure:3503: checking if you want full utility pathnames" >&5
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
 if test "${enable_full_paths+set}" = set; then
@@ -3525,7 +3524,7 @@ EOF
 
 
 echo $ac_n "checking for system mailer""... $ac_c" 1>&6
-echo "configure:3529: checking for system mailer" >&5
+echo "configure:3528: checking for system mailer" >&5
 if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3552,7 +3551,7 @@ EOF
 
 
 echo $ac_n "checking system mail flags""... $ac_c" 1>&6
-echo "configure:3556: checking system mail flags" >&5
+echo "configure:3555: checking system mail flags" >&5
 if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3580,7 +3579,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "chmod", so it can be a program name with args.
 set dummy chmod; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3584: checking for $ac_word" >&5
+echo "configure:3583: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3615,7 +3614,7 @@ fi
 
 else
 	echo $ac_n "checking for chmod""... $ac_c" 1>&6
-echo "configure:3619: checking for chmod" >&5
+echo "configure:3618: checking for chmod" >&5
 	echo "$ac_t""$CHMOD" 1>&6
 	eval 'ac_cv_path_'CHMOD'="'chmod'"'
 fi
@@ -3657,7 +3656,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "compress", so it can be a program name with args.
 set dummy compress; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3661: checking for $ac_word" >&5
+echo "configure:3660: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3692,7 +3691,7 @@ fi
 
 else
 	echo $ac_n "checking for compress""... $ac_c" 1>&6
-echo "configure:3696: checking for compress" >&5
+echo "configure:3695: checking for compress" >&5
 	echo "$ac_t""$COMPRESS" 1>&6
 	eval 'ac_cv_path_'COMPRESS'="'compress'"'
 fi
@@ -3734,7 +3733,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3738: checking for $ac_word" >&5
+echo "configure:3737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3769,7 +3768,7 @@ fi
 
 else
 	echo $ac_n "checking for cp""... $ac_c" 1>&6
-echo "configure:3773: checking for cp" >&5
+echo "configure:3772: checking for cp" >&5
 	echo "$ac_t""$COPY" 1>&6
 	eval 'ac_cv_path_'COPY'="'cp'"'
 fi
@@ -3811,7 +3810,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "gzip", so it can be a program name with args.
 set dummy gzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3815: checking for $ac_word" >&5
+echo "configure:3814: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3846,7 +3845,7 @@ fi
 
 else
 	echo $ac_n "checking for gzip""... $ac_c" 1>&6
-echo "configure:3850: checking for gzip" >&5
+echo "configure:3849: checking for gzip" >&5
 	echo "$ac_t""$GZIP" 1>&6
 	eval 'ac_cv_path_'GZIP'="'gzip'"'
 fi
@@ -3888,7 +3887,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "mkdir", so it can be a program name with args.
 set dummy mkdir; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3892: checking for $ac_word" >&5
+echo "configure:3891: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3923,7 +3922,7 @@ fi
 
 else
 	echo $ac_n "checking for mkdir""... $ac_c" 1>&6
-echo "configure:3927: checking for mkdir" >&5
+echo "configure:3926: checking for mkdir" >&5
 	echo "$ac_t""$MKDIR" 1>&6
 	eval 'ac_cv_path_'MKDIR'="'mkdir'"'
 fi
@@ -3965,7 +3964,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3969: checking for $ac_word" >&5
+echo "configure:3968: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4000,7 +3999,7 @@ fi
 
 else
 	echo $ac_n "checking for mv""... $ac_c" 1>&6
-echo "configure:4004: checking for mv" >&5
+echo "configure:4003: checking for mv" >&5
 	echo "$ac_t""$MV" 1>&6
 	eval 'ac_cv_path_'MV'="'mv'"'
 fi
@@ -4042,7 +4041,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4046: checking for $ac_word" >&5
+echo "configure:4045: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4077,7 +4076,7 @@ fi
 
 else
 	echo $ac_n "checking for rm""... $ac_c" 1>&6
-echo "configure:4081: checking for rm" >&5
+echo "configure:4080: checking for rm" >&5
 	echo "$ac_t""$RM" 1>&6
 	eval 'ac_cv_path_'RM'="'rm'"'
 fi
@@ -4119,7 +4118,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4123: checking for $ac_word" >&5
+echo "configure:4122: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4154,7 +4153,7 @@ fi
 
 else
 	echo $ac_n "checking for tar""... $ac_c" 1>&6
-echo "configure:4158: checking for tar" >&5
+echo "configure:4157: checking for tar" >&5
 	echo "$ac_t""$TAR" 1>&6
 	eval 'ac_cv_path_'TAR'="'tar'"'
 fi
@@ -4196,7 +4195,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "touch", so it can be a program name with args.
 set dummy touch; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4200: checking for $ac_word" >&5
+echo "configure:4199: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4231,7 +4230,7 @@ fi
 
 else
 	echo $ac_n "checking for touch""... $ac_c" 1>&6
-echo "configure:4235: checking for touch" >&5
+echo "configure:4234: checking for touch" >&5
 	echo "$ac_t""$TOUCH" 1>&6
 	eval 'ac_cv_path_'TOUCH'="'touch'"'
 fi
@@ -4273,7 +4272,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "gunzip", so it can be a program name with args.
 set dummy gunzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4277: checking for $ac_word" >&5
+echo "configure:4276: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4308,7 +4307,7 @@ fi
 
 else
 	echo $ac_n "checking for gunzip""... $ac_c" 1>&6
-echo "configure:4312: checking for gunzip" >&5
+echo "configure:4311: checking for gunzip" >&5
 	echo "$ac_t""$UNCOMPRESS" 1>&6
 	eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"'
 fi
@@ -4350,7 +4349,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "unzip", so it can be a program name with args.
 set dummy unzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4354: checking for $ac_word" >&5
+echo "configure:4353: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4385,7 +4384,7 @@ fi
 
 else
 	echo $ac_n "checking for unzip""... $ac_c" 1>&6
-echo "configure:4389: checking for unzip" >&5
+echo "configure:4388: checking for unzip" >&5
 	echo "$ac_t""$UNZIP" 1>&6
 	eval 'ac_cv_path_'UNZIP'="'unzip'"'
 fi
@@ -4427,7 +4426,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "bzip2", so it can be a program name with args.
 set dummy bzip2; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4431: checking for $ac_word" >&5
+echo "configure:4430: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4462,7 +4461,7 @@ fi
 
 else
 	echo $ac_n "checking for bzip2""... $ac_c" 1>&6
-echo "configure:4466: checking for bzip2" >&5
+echo "configure:4465: checking for bzip2" >&5
 	echo "$ac_t""$BZIP2" 1>&6
 	eval 'ac_cv_path_'BZIP2'="'bzip2'"'
 fi
@@ -4504,7 +4503,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "uudecode", so it can be a program name with args.
 set dummy uudecode; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4508: checking for $ac_word" >&5
+echo "configure:4507: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4539,7 +4538,7 @@ fi
 
 else
 	echo $ac_n "checking for uudecode""... $ac_c" 1>&6
-echo "configure:4543: checking for uudecode" >&5
+echo "configure:4542: checking for uudecode" >&5
 	echo "$ac_t""$UUDECODE" 1>&6
 	eval 'ac_cv_path_'UUDECODE'="'uudecode'"'
 fi
@@ -4581,7 +4580,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "zcat", so it can be a program name with args.
 set dummy zcat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4585: checking for $ac_word" >&5
+echo "configure:4584: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4616,7 +4615,7 @@ fi
 
 else
 	echo $ac_n "checking for zcat""... $ac_c" 1>&6
-echo "configure:4620: checking for zcat" >&5
+echo "configure:4619: checking for zcat" >&5
 	echo "$ac_t""$ZCAT" 1>&6
 	eval 'ac_cv_path_'ZCAT'="'zcat'"'
 fi
@@ -4658,7 +4657,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "zip", so it can be a program name with args.
 set dummy zip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4662: checking for $ac_word" >&5
+echo "configure:4661: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4693,7 +4692,7 @@ fi
 
 else
 	echo $ac_n "checking for zip""... $ac_c" 1>&6
-echo "configure:4697: checking for zip" >&5
+echo "configure:4696: checking for zip" >&5
 	echo "$ac_t""$ZIP" 1>&6
 	eval 'ac_cv_path_'ZIP'="'zip'"'
 fi
@@ -4735,7 +4734,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "telnet", so it can be a program name with args.
 set dummy telnet; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4739: checking for $ac_word" >&5
+echo "configure:4738: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4770,7 +4769,7 @@ fi
 
 else
 	echo $ac_n "checking for telnet""... $ac_c" 1>&6
-echo "configure:4774: checking for telnet" >&5
+echo "configure:4773: checking for telnet" >&5
 	echo "$ac_t""$TELNET" 1>&6
 	eval 'ac_cv_path_'TELNET'="'telnet'"'
 fi
@@ -4812,7 +4811,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "tn3270", so it can be a program name with args.
 set dummy tn3270; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4816: checking for $ac_word" >&5
+echo "configure:4815: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4847,7 +4846,7 @@ fi
 
 else
 	echo $ac_n "checking for tn3270""... $ac_c" 1>&6
-echo "configure:4851: checking for tn3270" >&5
+echo "configure:4850: checking for tn3270" >&5
 	echo "$ac_t""$TN3270" 1>&6
 	eval 'ac_cv_path_'TN3270'="'tn3270'"'
 fi
@@ -4889,7 +4888,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "rlogin", so it can be a program name with args.
 set dummy rlogin; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4893: checking for $ac_word" >&5
+echo "configure:4892: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4924,7 +4923,7 @@ fi
 
 else
 	echo $ac_n "checking for rlogin""... $ac_c" 1>&6
-echo "configure:4928: checking for rlogin" >&5
+echo "configure:4927: checking for rlogin" >&5
 	echo "$ac_t""$RLOGIN" 1>&6
 	eval 'ac_cv_path_'RLOGIN'="'rlogin'"'
 fi
@@ -4985,7 +4984,7 @@ EOF
 if test -z "$GCC" ; then
 	
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:4989: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:4988: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5009,7 +5008,7 @@ for cf_arg in "-DCC_HAS_PROTOS" \
 do
 	CFLAGS="$cf_save_CFLAGS $cf_arg"
 	cat > conftest.$ac_ext <<EOF
-#line 5013 "configure"
+#line 5012 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -5025,7 +5024,7 @@ int main() {
 	struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:5029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -5053,12 +5052,12 @@ fi
 
 fi
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5057: checking for working const" >&5
+echo "configure:5056: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5062 "configure"
+#line 5061 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5107,7 +5106,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -5149,7 +5148,7 @@ clix*)
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 	echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6
-echo "configure:5153: checking for strcmp in -lc_s" >&5
+echo "configure:5152: checking for strcmp in -lc_s" >&5
 ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5157,7 +5156,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5161 "configure"
+#line 5160 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5168,7 +5167,7 @@ int main() {
 strcmp()
 ; return 0; }
 EOF
-if { (eval echo configure:5172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5258,7 +5257,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5262: checking for $ac_word" >&5
+echo "configure:5261: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5303,17 +5302,17 @@ sony-newsos*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5307: checking for $ac_hdr" >&5
+echo "configure:5306: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5312 "configure"
+#line 5311 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5357,17 +5356,17 @@ ultrix*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5361: checking for $ac_hdr" >&5
+echo "configure:5360: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5366 "configure"
+#line 5365 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5405,16 +5404,16 @@ if test -n "$TRY_CFLAGS" ; then
 	cf_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $TRY_CFLAGS"
 	echo $ac_n "checking if we should use compile options $TRY_CFLAGS""... $ac_c" 1>&6
-echo "configure:5409: checking if we should use compile options $TRY_CFLAGS" >&5
+echo "configure:5408: checking if we should use compile options $TRY_CFLAGS" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 5411 "configure"
+#line 5410 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 FILE *fp = stdin
 ; return 0; }
 EOF
-if { (eval echo configure:5418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -5432,7 +5431,7 @@ fi
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
 echo $ac_n "checking if you want socks library""... $ac_c" 1>&6
-echo "configure:5436: checking if you want socks library" >&5
+echo "configure:5435: checking if you want socks library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5452,7 +5451,7 @@ fi
 echo "$ac_t""$cf_cv_use_libsocks" 1>&6
 
 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6
-echo "configure:5456: checking if you want socks5 library" >&5
+echo "configure:5455: checking if you want socks5 library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5518,7 +5517,7 @@ cat >> confdefs.h <<\EOF
 EOF
 
 cat > conftest.$ac_ext <<EOF
-#line 5522 "configure"
+#line 5521 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5527,7 +5526,7 @@ int main() {
 	accept((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -5557,9 +5556,9 @@ cat >> confdefs.h <<\EOF
 EOF
 
 echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6
-echo "configure:5561: checking if the socks library uses socks4 prefix" >&5
+echo "configure:5560: checking if the socks library uses socks4 prefix" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5563 "configure"
+#line 5562 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -5568,7 +5567,7 @@ int main() {
 	Rinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -5580,14 +5579,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 5584 "configure"
+#line 5583 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int main() {
 SOCKSinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_use_socks4=no
 else
@@ -5656,7 +5655,7 @@ else
 	
 cf_test_netlibs=no
 echo $ac_n "checking for network libraries""... $ac_c" 1>&6
-echo "configure:5660: checking for network libraries" >&5
+echo "configure:5659: checking for network libraries" >&5
 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5667,12 +5666,12 @@ cf_test_netlibs=yes
 for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5671: checking for $ac_func" >&5
+echo "configure:5670: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5676 "configure"
+#line 5675 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5695,7 +5694,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5718,7 +5717,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:5722: checking for gethostname in -lnsl" >&5
+echo "configure:5721: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5726,7 +5725,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5730 "configure"
+#line 5729 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5737,7 +5736,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:5741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5770,7 +5769,7 @@ else
 	
 		
 echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6
-echo "configure:5774: checking for gethostname in -lsocket" >&5
+echo "configure:5773: checking for gethostname in -lsocket" >&5
 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5778,7 +5777,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5782 "configure"
+#line 5781 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5789,7 +5788,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:5793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5833,21 +5832,21 @@ done
 # FIXME:  sequent needs this library (i.e., -lsocket -linet -lnsl), but
 # I don't know the entrypoints - 97/7/22 TD
 echo $ac_n "checking for -linet""... $ac_c" 1>&6
-echo "configure:5837: checking for -linet" >&5
+echo "configure:5836: checking for -linet" >&5
 if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5844 "configure"
+#line 5843 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_inet=yes
 else
@@ -5870,12 +5869,12 @@ if test "$ac_cv_func_lsocket" != no ; then
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5874: checking for $ac_func" >&5
+echo "configure:5873: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5879 "configure"
+#line 5878 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5898,7 +5897,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5921,7 +5920,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:5925: checking for socket in -lsocket" >&5
+echo "configure:5924: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5929,7 +5928,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5933 "configure"
+#line 5932 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5940,7 +5939,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5973,7 +5972,7 @@ else
 	
 		
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:5977: checking for socket in -lbsd" >&5
+echo "configure:5976: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5981,7 +5980,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5985 "configure"
+#line 5984 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5992,7 +5991,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:5996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6037,12 +6036,12 @@ fi
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6041: checking for $ac_func" >&5
+echo "configure:6040: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6046 "configure"
+#line 6045 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6065,7 +6064,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6088,7 +6087,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6092: checking for gethostbyname in -lnsl" >&5
+echo "configure:6091: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6096,7 +6095,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6100 "configure"
+#line 6099 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6107,7 +6106,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6148,12 +6147,12 @@ done
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6152: checking for $ac_func" >&5
+echo "configure:6151: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6157 "configure"
+#line 6156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6176,7 +6175,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6199,7 +6198,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
-echo "configure:6203: checking for strcasecmp in -lresolv" >&5
+echo "configure:6202: checking for strcasecmp in -lresolv" >&5
 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6207,7 +6206,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6211 "configure"
+#line 6210 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6218,7 +6217,7 @@ int main() {
 strcasecmp()
 ; return 0; }
 EOF
-if { (eval echo configure:6222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6264,13 +6263,13 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 fi
 
 echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6
-echo "configure:6268: checking for inet_aton function" >&5
+echo "configure:6267: checking for inet_aton function" >&5
 if eval "test \"`echo '$''{'cf_cv_have_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 6274 "configure"
+#line 6273 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6281,7 +6280,7 @@ int main() {
 inet_aton(0, (struct in_addr *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_inet_aton=yes
 else
@@ -6301,13 +6300,13 @@ EOF
 
 else
     echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6
-echo "configure:6305: checking for inet_addr function" >&5
+echo "configure:6304: checking for inet_addr function" >&5
 if eval "test \"`echo '$''{'cf_cv_have_inet_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 6311 "configure"
+#line 6310 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6318,7 +6317,7 @@ int main() {
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:6322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_inet_addr=yes
 else
@@ -6333,7 +6332,7 @@ fi
 echo "$ac_t""$cf_cv_have_inet_addr" 1>&6
     if test "$cf_cv_have_inet_addr" = no ; then
 	echo $ac_n "checking for library with inet_addr""... $ac_c" 1>&6
-echo "configure:6337: checking for library with inet_addr" >&5
+echo "configure:6336: checking for library with inet_addr" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_inet_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6343,7 +6342,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat > conftest.$ac_ext <<EOF
-#line 6347 "configure"
+#line 6346 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6354,7 +6353,7 @@ int main() {
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:6358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -6381,7 +6380,7 @@ fi
 
 
 echo $ac_n "checking for screen type""... $ac_c" 1>&6
-echo "configure:6385: checking for screen type" >&5
+echo "configure:6384: checking for screen type" >&5
 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6416,12 +6415,12 @@ case $cf_cv_screen in
 curses)
 	
 echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:6420: checking for initscr" >&5
+echo "configure:6419: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6425 "configure"
+#line 6424 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -6444,7 +6443,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -6465,7 +6464,7 @@ else
 case $host_os in #(vi
 freebsd*) #(vi
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:6469: checking for tgoto in -lmytinfo" >&5
+echo "configure:6468: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6473,7 +6472,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6477 "configure"
+#line 6476 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6484,7 +6483,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6507,7 +6506,7 @@ fi
 	;;
 hpux10.*)
 	echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-echo "configure:6511: checking for initscr in -lcur_colr" >&5
+echo "configure:6510: checking for initscr in -lcur_colr" >&5
 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6515,7 +6514,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcur_colr  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6519 "configure"
+#line 6518 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6526,7 +6525,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6550,7 +6549,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-echo "configure:6554: checking for initscr in -lHcurses" >&5
+echo "configure:6553: checking for initscr in -lHcurses" >&5
 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6558,7 +6557,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lHcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6562 "configure"
+#line 6561 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6569,7 +6568,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6618,12 +6617,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# Check for library containing tgoto.  Do this before curses library
 	# because it may be needed to link the test-case for initscr.
 	echo $ac_n "checking for tgoto""... $ac_c" 1>&6
-echo "configure:6622: checking for tgoto" >&5
+echo "configure:6621: checking for tgoto" >&5
 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6627 "configure"
+#line 6626 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto(); below.  */
@@ -6646,7 +6645,7 @@ tgoto();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_tgoto=yes"
 else
@@ -6667,7 +6666,7 @@ else
 		for cf_term_lib in termcap termlib unknown
 		do
 			echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-echo "configure:6671: checking for tgoto in -l$cf_term_lib" >&5
+echo "configure:6670: checking for tgoto in -l$cf_term_lib" >&5
 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6675,7 +6674,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_term_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6679 "configure"
+#line 6678 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6686,7 +6685,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6716,7 +6715,7 @@ fi
 	for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown
 	do
 		echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-echo "configure:6720: checking for initscr in -l$cf_curs_lib" >&5
+echo "configure:6719: checking for initscr in -l$cf_curs_lib" >&5
 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6724,7 +6723,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_curs_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6728 "configure"
+#line 6727 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6735,7 +6734,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6761,16 +6760,16 @@ fi
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
 		echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
-echo "configure:6765: checking if we can link with $cf_curs_lib library" >&5
+echo "configure:6764: checking if we can link with $cf_curs_lib library" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6767 "configure"
+#line 6766 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6784,16 +6783,16 @@ rm -f conftest*
 		test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; }
 	elif test "$cf_term_lib" != predefined ; then
 		echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
-echo "configure:6788: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+echo "configure:6787: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6790 "configure"
+#line 6789 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=no
 else
@@ -6803,14 +6802,14 @@ else
   
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 6807 "configure"
+#line 6806 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6832,14 +6831,14 @@ fi
 
 	
 echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6
-echo "configure:6836: checking for curses performance tradeoff" >&5
+echo "configure:6835: checking for curses performance tradeoff" >&5
 if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cf_cv_curs_performance=no
     cat > conftest.$ac_ext <<EOF
-#line 6843 "configure"
+#line 6842 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6853,11 +6852,11 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 6861 "configure"
+#line 6860 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -6872,7 +6871,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_curs_performance=yes
 else
@@ -6897,13 +6896,13 @@ EOF
 ncurses)
 	
 echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6
-echo "configure:6901: checking for ncurses header file" >&5
+echo "configure:6900: checking for ncurses header file" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 6907 "configure"
+#line 6906 "configure"
 #include "confdefs.h"
 #include <curses.h>
 int main() {
@@ -6920,7 +6919,7 @@ make an error
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_header=predefined
 else
@@ -7006,7 +7005,7 @@ done
 	;;
 esac
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:7010: checking for ncurses version" >&5
+echo "configure:7009: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7031,7 +7030,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:7035: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:7034: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -7040,7 +7039,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 7044 "configure"
+#line 7043 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7063,7 +7062,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:7067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7088,7 +7087,7 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:7092: checking for Gpm_Open in -lgpm" >&5
+echo "configure:7091: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7096,7 +7095,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7100 "configure"
+#line 7099 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7107,7 +7106,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7123,7 +7122,7 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-echo "configure:7127: checking for initscr in -lgpm" >&5
+echo "configure:7126: checking for initscr in -lgpm" >&5
 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7131,7 +7130,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7135 "configure"
+#line 7134 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7142,7 +7141,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7173,7 +7172,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:7177: checking for tgoto in -lmytinfo" >&5
+echo "configure:7176: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7181,7 +7180,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7185 "configure"
+#line 7184 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7192,7 +7191,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7220,12 +7219,12 @@ LIBS="$cf_ncurses_LIBS $LIBS"
 	cf_cv_have_lib_ncurses=no
 	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:7224: checking for initscr" >&5
+echo "configure:7223: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7229 "configure"
+#line 7228 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -7248,7 +7247,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -7268,17 +7267,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:7272: checking for initscr in -lncurses" >&5
+echo "configure:7271: checking for initscr in -lncurses" >&5
 		LIBS="-lncurses $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 7275 "configure"
+#line 7274 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_ncurses=yes
@@ -7305,17 +7304,17 @@ test "$prefix" != /usr           && cf_search="$cf_search /usr/lib /usr/lib/ncur
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6
-echo "configure:7309: checking for -lncurses in $cf_libdir" >&5
+echo "configure:7308: checking for -lncurses in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lncurses $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 7312 "configure"
+#line 7311 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_ncurses=yes
@@ -7347,7 +7346,7 @@ esac
 
 if test -n "$cf_ncurses_LIBS" ; then
 	echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:7351: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
+echo "configure:7350: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
 		q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'`
@@ -7356,14 +7355,14 @@ echo "configure:7351: checking if we can link ncurses without $cf_ncurses_LIBS"
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 7360 "configure"
+#line 7359 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7380,20 +7379,20 @@ fi
 slang)
 	
 echo $ac_n "checking for slang header file""... $ac_c" 1>&6
-echo "configure:7384: checking for slang header file" >&5
+echo "configure:7383: checking for slang header file" >&5
 if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 7390 "configure"
+#line 7389 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 printf("%s\n", SLANG_VERSION)
 ; return 0; }
 EOF
-if { (eval echo configure:7397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_slang_header=predefined
 else
@@ -7475,24 +7474,24 @@ else
   
 cf_cv_termlib=none
 cat > conftest.$ac_ext <<EOF
-#line 7479 "configure"
+#line 7478 "configure"
 #include "confdefs.h"
 
 int main() {
 char *x=(char*)tgoto("",0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:7486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 7489 "configure"
+#line 7488 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=tigetstr("")
 ; return 0; }
 EOF
-if { (eval echo configure:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_termlib=terminfo
 else
@@ -7514,7 +7513,7 @@ else
 # HP-UX 9.x terminfo has setupterm, but no tigetstr.
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tigetstr in -ltermlib""... $ac_c" 1>&6
-echo "configure:7518: checking for tigetstr in -ltermlib" >&5
+echo "configure:7517: checking for tigetstr in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tigetstr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7522,7 +7521,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7526 "configure"
+#line 7525 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7533,7 +7532,7 @@ int main() {
 tigetstr()
 ; return 0; }
 EOF
-if { (eval echo configure:7537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7556,7 +7555,7 @@ fi
 fi
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6
-echo "configure:7560: checking for tgoto in -ltermlib" >&5
+echo "configure:7559: checking for tgoto in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7564,7 +7563,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7568 "configure"
+#line 7567 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7575,7 +7574,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7599,7 +7598,7 @@ fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:7603: checking for initscr in -lcurses" >&5
+echo "configure:7602: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7607,7 +7606,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7611 "configure"
+#line 7610 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7618,7 +7617,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7639,7 +7638,7 @@ else
 fi
 
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:7643: checking for tgoto in -ltermcap" >&5
+echo "configure:7642: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7647,7 +7646,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7651 "configure"
+#line 7650 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7658,7 +7657,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7681,7 +7680,7 @@ fi
 fi
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:7685: checking for tgoto in -ltermcap" >&5
+echo "configure:7684: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7689,7 +7688,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7693 "configure"
+#line 7692 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7700,7 +7699,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7723,7 +7722,7 @@ fi
 fi
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tgoto in -lncurses""... $ac_c" 1>&6
-echo "configure:7727: checking for tgoto in -lncurses" >&5
+echo "configure:7726: checking for tgoto in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7731,7 +7730,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7735 "configure"
+#line 7734 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7742,7 +7741,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7774,12 +7773,12 @@ fi
 
 cf_slang_LIBS2="$LIBS"
 echo $ac_n "checking for acos""... $ac_c" 1>&6
-echo "configure:7778: checking for acos" >&5
+echo "configure:7777: checking for acos" >&5
 if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7783 "configure"
+#line 7782 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos(); below.  */
@@ -7802,7 +7801,7 @@ acos();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_acos=yes"
 else
@@ -7821,7 +7820,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
-echo "configure:7825: checking for acos in -lm" >&5
+echo "configure:7824: checking for acos in -lm" >&5
 ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7829,7 +7828,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7833 "configure"
+#line 7832 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7840,7 +7839,7 @@ int main() {
 acos()
 ; return 0; }
 EOF
-if { (eval echo configure:7844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7880,12 +7879,12 @@ fi
 	cf_cv_have_lib_slang=no
 	cf_libdir=""
 	echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6
-echo "configure:7884: checking for SLtt_get_screen_size" >&5
+echo "configure:7883: checking for SLtt_get_screen_size" >&5
 if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7889 "configure"
+#line 7888 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size(); below.  */
@@ -7908,7 +7907,7 @@ SLtt_get_screen_size();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_SLtt_get_screen_size=yes"
 else
@@ -7928,17 +7927,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:7932: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:7931: checking for SLtt_get_screen_size in -lslang" >&5
 		LIBS="-lslang $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 7935 "configure"
+#line 7934 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:7942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_slang=yes
@@ -7965,17 +7964,17 @@ test "$prefix" != /usr           && cf_search="$cf_search /usr/lib /usr/lib/slan
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6
-echo "configure:7969: checking for -lslang in $cf_libdir" >&5
+echo "configure:7968: checking for -lslang in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 7972 "configure"
+#line 7971 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:7979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_slang=yes
@@ -8006,7 +8005,7 @@ esac
 
 cf_slang_LIBS3="$LIBS"
 echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6
-echo "configure:8010: checking if we can link slang without termcap" >&5
+echo "configure:8009: checking if we can link slang without termcap" >&5
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s@$cf_slang_LIBS1@@" -e 's@^.@@'`
 else
@@ -8014,14 +8013,14 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'`
 cat > conftest.$ac_ext <<EOF
-#line 8018 "configure"
+#line 8017 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -8041,7 +8040,7 @@ eval cf_libdir=$libdir
 cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
 
 echo $ac_n "checking for location of config-file""... $ac_c" 1>&6
-echo "configure:8045: checking for location of config-file" >&5
+echo "configure:8044: checking for location of config-file" >&5
 LYNX_CFG_FILE=$cf_libdir/lynx.cfg
 cat >> confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
@@ -8051,12 +8050,12 @@ echo "$ac_t""$LYNX_CFG_FILE" 1>&6
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8055: checking for ANSI C header files" >&5
+echo "configure:8054: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8060 "configure"
+#line 8059 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8064,7 +8063,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8081,7 +8080,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 8085 "configure"
+#line 8084 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -8099,7 +8098,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 <<EOF
-#line 8103 "configure"
+#line 8102 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -8120,7 +8119,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 8124 "configure"
+#line 8123 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -8131,7 +8130,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:8135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -8155,12 +8154,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:8159: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:8158: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8164 "configure"
+#line 8163 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -8169,7 +8168,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:8173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -8194,12 +8193,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:8198: checking for $ac_hdr that defines DIR" >&5
+echo "configure:8197: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8203 "configure"
+#line 8202 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -8207,7 +8206,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:8211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -8232,7 +8231,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:8236: checking for opendir in -ldir" >&5
+echo "configure:8235: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8240,7 +8239,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8244 "configure"
+#line 8243 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8251,7 +8250,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8273,7 +8272,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8277: checking for opendir in -lx" >&5
+echo "configure:8276: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8281,7 +8280,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8285 "configure"
+#line 8284 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8292,7 +8291,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8331,17 +8330,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8335: checking for $ac_hdr" >&5
+echo "configure:8334: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8340 "configure"
+#line 8339 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8369,13 +8368,13 @@ done
 
 
 echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6
-echo "configure:8373: checking termio.h and termios.h" >&5
+echo "configure:8372: checking termio.h and termios.h" >&5
 if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 8379 "configure"
+#line 8378 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -8388,7 +8387,7 @@ int main() {
 putchar (0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:8392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_termios=yes
 else
@@ -8411,17 +8410,17 @@ for ac_hdr in sys/wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8415: checking for $ac_hdr" >&5
+echo "configure:8414: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8420 "configure"
+#line 8419 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8458,17 +8457,17 @@ for ac_hdr in wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8462: checking for $ac_hdr" >&5
+echo "configure:8461: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8467 "configure"
+#line 8466 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8498,17 +8497,17 @@ for ac_hdr in waitstatus.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8502: checking for $ac_hdr" >&5
+echo "configure:8501: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8507 "configure"
+#line 8506 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8549,13 +8548,13 @@ fi
 
 
 echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:8553: checking for union wait" >&5
+echo "configure:8552: checking for union wait" >&5
 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8559 "configure"
+#line 8558 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -8566,7 +8565,7 @@ int x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -8577,7 +8576,7 @@ else
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 8581 "configure"
+#line 8580 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -8592,7 +8591,7 @@ union wait x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:8596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -8619,20 +8618,20 @@ EOF
 if test $cf_cv_type_unionwait = yes; then
 
 	echo $ac_n "checking if union wait can be used as wait-arg""... $ac_c" 1>&6
-echo "configure:8623: checking if union wait can be used as wait-arg" >&5
+echo "configure:8622: checking if union wait can be used as wait-arg" >&5
 	if eval "test \"`echo '$''{'cf_cv_arg_union_wait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 8629 "configure"
+#line 8628 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; wait(&x)
 ; return 0; }
 EOF
-if { (eval echo configure:8636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_wait=yes
 else
@@ -8652,20 +8651,20 @@ EOF
 
 
 	echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6
-echo "configure:8656: checking if union wait can be used as waitpid-arg" >&5
+echo "configure:8655: checking if union wait can be used as waitpid-arg" >&5
 	if eval "test \"`echo '$''{'cf_cv_arg_union_waitpid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 8662 "configure"
+#line 8661 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; waitpid(0, &x, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:8669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_waitpid=yes
 else
@@ -8691,17 +8690,17 @@ for ac_hdr in stdarg.h varargs.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8695: checking for $ac_hdr" >&5
+echo "configure:8694: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8700 "configure"
+#line 8699 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8728,13 +8727,13 @@ fi
 done
 
 echo $ac_n "checking for standard varargs""... $ac_c" 1>&6
-echo "configure:8732: checking for standard varargs" >&5
+echo "configure:8731: checking for standard varargs" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_varargs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8738 "configure"
+#line 8737 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -8749,7 +8748,7 @@ int main() {
 return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 ; return 0; }
 EOF
-if { (eval echo configure:8753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_varargs=yes
 else
@@ -8769,12 +8768,12 @@ EOF
 
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8773: checking for uid_t in sys/types.h" >&5
+echo "configure:8772: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8778 "configure"
+#line 8777 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -8803,7 +8802,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:8807: checking type of array argument to getgroups" >&5
+echo "configure:8806: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8811,7 +8810,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 8815 "configure"
+#line 8814 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -8836,7 +8835,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:8840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -8850,7 +8849,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 8854 "configure"
+#line 8853 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -8874,12 +8873,12 @@ EOF
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:8878: checking for pid_t" >&5
+echo "configure:8877: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8883 "configure"
+#line 8882 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8907,12 +8906,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8911: checking for uid_t in sys/types.h" >&5
+echo "configure:8910: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8916 "configure"
+#line 8915 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -8941,12 +8940,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:8945: checking for mode_t" >&5
+echo "configure:8944: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8950 "configure"
+#line 8949 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8977,17 +8976,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:8981: checking for vfork.h" >&5
+echo "configure:8980: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8986 "configure"
+#line 8985 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9012,18 +9011,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:9016: checking for working vfork" >&5
+echo "configure:9015: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:9022: checking for vfork" >&5
+echo "configure:9021: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9027 "configure"
+#line 9026 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -9046,7 +9045,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:9050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -9068,7 +9067,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 9072 "configure"
+#line 9071 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -9163,7 +9162,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:9167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -9187,13 +9186,13 @@ fi
 
 
 echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6
-echo "configure:9191: checking if we should use fcntl or ioctl" >&5
+echo "configure:9190: checking if we should use fcntl or ioctl" >&5
 if eval "test \"`echo '$''{'cf_cv_fionbio'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9197 "configure"
+#line 9196 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9205,7 +9204,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=ioctl
 else
@@ -9214,7 +9213,7 @@ else
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 9218 "configure"
+#line 9217 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9231,7 +9230,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=fcntl
 else
@@ -9254,20 +9253,20 @@ EOF
 
 
 echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6
-echo "configure:9258: checking for broken/missing definition of remove" >&5
+echo "configure:9257: checking for broken/missing definition of remove" >&5
 if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9264 "configure"
+#line 9263 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:9271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=no
 else
@@ -9275,7 +9274,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 9279 "configure"
+#line 9278 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); } 
@@ -9283,7 +9282,7 @@ int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:9287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=yes
 else
@@ -9307,13 +9306,13 @@ EOF
 
 
 echo $ac_n "checking for lstat""... $ac_c" 1>&6
-echo "configure:9311: checking for lstat" >&5
+echo "configure:9310: checking for lstat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_lstat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9317 "configure"
+#line 9316 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9322,7 +9321,7 @@ int main() {
 lstat(".", (struct stat *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:9326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_lstat=yes
 else
@@ -9357,12 +9356,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9361: checking for $ac_func" >&5
+echo "configure:9360: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9366 "configure"
+#line 9365 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9385,7 +9384,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:9389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9415,12 +9414,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9419: checking for $ac_func" >&5
+echo "configure:9418: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9424 "configure"
+#line 9423 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9443,7 +9442,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:9447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9474,12 +9473,12 @@ for ac_func in strstr
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:9478: checking for $ac_func declaration" >&5
+echo "configure:9477: checking for $ac_func declaration" >&5
 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9483 "configure"
+#line 9482 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -9488,11 +9487,11 @@ extern	int	${ac_func}();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 9496 "configure"
+#line 9495 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -9501,7 +9500,7 @@ int	(*p)() = ${ac_func};
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -9543,12 +9542,12 @@ for ac_func in getgrgid getgrnam
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:9547: checking for $ac_func declaration" >&5
+echo "configure:9546: checking for $ac_func declaration" >&5
 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9552 "configure"
+#line 9551 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9559,11 +9558,11 @@ extern	int	${ac_func}();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 9567 "configure"
+#line 9566 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9574,7 +9573,7 @@ int	(*p)() = ${ac_func};
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -9616,13 +9615,13 @@ done
 
 
 echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6
-echo "configure:9620: checking if TRUE/FALSE are defined" >&5
+echo "configure:9619: checking if TRUE/FALSE are defined" >&5
 if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9626 "configure"
+#line 9625 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9631,7 +9630,7 @@ int main() {
 int x = TRUE, y = FALSE
 ; return 0; }
 EOF
-if { (eval echo configure:9635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_bool_defs=yes
 else
@@ -9658,13 +9657,13 @@ fi
 
 
 echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:9662: checking if external errno is declared" >&5
+echo "configure:9661: checking if external errno is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 9668 "configure"
+#line 9667 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -9677,7 +9676,7 @@ int main() {
 long x = (long) errno
 ; return 0; }
 EOF
-if { (eval echo configure:9681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_dcl_'errno'=yes'
 else
@@ -9708,13 +9707,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:9712: checking if external errno exists" >&5
+echo "configure:9711: checking if external errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 9718 "configure"
+#line 9717 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -9724,7 +9723,7 @@ int main() {
 errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:9728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval 'cf_cv_have_'errno'=yes'
 else
@@ -9756,20 +9755,20 @@ fi
 
 
 echo $ac_n "checking for setlocale()""... $ac_c" 1>&6
-echo "configure:9760: checking for setlocale()" >&5
+echo "configure:9759: checking for setlocale()" >&5
 if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9766 "configure"
+#line 9765 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 setlocale(LC_ALL, "")
 ; return 0; }
 EOF
-if { (eval echo configure:9773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_locale=yes
 else
@@ -9790,13 +9789,13 @@ EOF
 
 
 echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6
-echo "configure:9794: checking if NGROUPS is defined" >&5
+echo "configure:9793: checking if NGROUPS is defined" >&5
 if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9800 "configure"
+#line 9799 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -9810,7 +9809,7 @@ int main() {
 int x = NGROUPS
 ; return 0; }
 EOF
-if { (eval echo configure:9814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=yes
 else
@@ -9818,7 +9817,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 9822 "configure"
+#line 9821 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -9832,7 +9831,7 @@ int main() {
 int x = NGROUPS_MAX
 ; return 0; }
 EOF
-if { (eval echo configure:9836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -9866,13 +9865,13 @@ for cf_name in sys_nerr sys_errlist
 do
     
 echo $ac_n "checking if external $cf_name is declared""... $ac_c" 1>&6
-echo "configure:9870: checking if external $cf_name is declared" >&5
+echo "configure:9869: checking if external $cf_name is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 9876 "configure"
+#line 9875 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -9885,7 +9884,7 @@ int main() {
 long x = (long) $cf_name
 ; return 0; }
 EOF
-if { (eval echo configure:9889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_dcl_'$cf_name'=yes'
 else
@@ -9916,13 +9915,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external $cf_name exists""... $ac_c" 1>&6
-echo "configure:9920: checking if external $cf_name exists" >&5
+echo "configure:9919: checking if external $cf_name exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_$cf_name'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 9926 "configure"
+#line 9925 "configure"
 #include "confdefs.h"
 
 #undef $cf_name
@@ -9932,7 +9931,7 @@ int main() {
 $cf_name = 2
 ; return 0; }
 EOF
-if { (eval echo configure:9936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval 'cf_cv_have_'$cf_name'=yes'
 else
@@ -9965,13 +9964,13 @@ done
 
 
 echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6
-echo "configure:9969: checking if struct utmp is declared" >&5
+echo "configure:9968: checking if struct utmp is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 9975 "configure"
+#line 9974 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9980,7 +9979,7 @@ int main() {
 struct utmp x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:9984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=yes
 else
@@ -9988,14 +9987,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 9992 "configure"
+#line 9991 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 int main() {
 struct utmpx x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:9999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=utmpx
 else
@@ -10023,13 +10022,13 @@ EOF
 
 
 echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6
-echo "configure:10027: checking if external h_errno exists" >&5
+echo "configure:10026: checking if external h_errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_h_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10033 "configure"
+#line 10032 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -10039,7 +10038,7 @@ int main() {
 h_errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval 'cf_cv_have_'h_errno'=yes'
 else
@@ -10070,13 +10069,13 @@ fi
 
 
 echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6
-echo "configure:10074: checking if character set is EBCDIC" >&5
+echo "configure:10073: checking if character set is EBCDIC" >&5
 if eval "test \"`echo '$''{'cf_cv_ebcdic'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10080 "configure"
+#line 10079 "configure"
 #include "confdefs.h"
  
 int main() {
@@ -10089,7 +10088,7 @@ make an error "Character set is not EBCDIC"
 #endif 
 ; return 0; }
 EOF
-if { (eval echo configure:10093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    # TryCompile action if true
 cf_cv_ebcdic=yes 
@@ -10123,7 +10122,7 @@ esac
 if test $cf_cv_screen != slang ; then
 	
 echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
-echo "configure:10127: checking if curses supports alternate-character set" >&5
+echo "configure:10126: checking if curses supports alternate-character set" >&5
 if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10131,7 +10130,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat > conftest.$ac_ext <<EOF
-#line 10135 "configure"
+#line 10134 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10140,7 +10139,7 @@ int main() {
 chtype x = $mapname['l']; $mapname['m'] = 0
 ; return 0; }
 EOF
-if { (eval echo configure:10144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_alt_char_set=$mapname
 	 break
@@ -10163,13 +10162,13 @@ EOF
 
 	
 echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
-echo "configure:10167: checking if curses supports fancy attributes" >&5
+echo "configure:10166: checking if curses supports fancy attributes" >&5
 if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10173 "configure"
+#line 10172 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10182,7 +10181,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fancy_curses=yes
 else
@@ -10202,7 +10201,7 @@ EOF
 
 
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10206: checking for ncurses version" >&5
+echo "configure:10205: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10227,7 +10226,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:10231: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:10230: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -10236,7 +10235,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 10240 "configure"
+#line 10239 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10259,7 +10258,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10279,13 +10278,13 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6
 
 if test "$cf_cv_ncurses_version" != no ; then
 echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
-echo "configure:10283: checking for obsolete/broken version of ncurses" >&5
+echo "configure:10282: checking for obsolete/broken version of ncurses" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 10289 "configure"
+#line 10288 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10299,7 +10298,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:10303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_broken=no
 else
@@ -10324,13 +10323,13 @@ fi
 
 	
 echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:10328: checking if curses supports color attributes" >&5
+echo "configure:10327: checking if curses supports color attributes" >&5
 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10334 "configure"
+#line 10333 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10345,7 +10344,7 @@ chtype x = COLOR_BLUE;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_color_curses=yes
 else
@@ -10372,7 +10371,7 @@ fi
 
 	
 echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:10376: checking declaration of size-change" >&5
+echo "configure:10375: checking declaration of size-change" >&5
 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10386,7 +10385,7 @@ do
     CFLAGS="$cf_save_CFLAGS"
     test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts"
     cat > conftest.$ac_ext <<EOF
-#line 10390 "configure"
+#line 10389 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if HAVE_TERMIOS_H
@@ -10425,7 +10424,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sizechange=yes
 else
@@ -10457,20 +10456,20 @@ EOF
 
 	
 echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
-echo "configure:10461: checking if ttytype is declared in curses library" >&5
+echo "configure:10460: checking if ttytype is declared in curses library" >&5
 if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10467 "configure"
+#line 10466 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 char *x = &ttytype[1]; *x = 1
 ; return 0; }
 EOF
-if { (eval echo configure:10474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_ttytype=yes
 else
@@ -10498,12 +10497,12 @@ EOF
 	
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10502: checking for $ac_func" >&5
+echo "configure:10501: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10507 "configure"
+#line 10506 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10526,7 +10525,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10556,7 +10555,7 @@ fi
 
 
 echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6
-echo "configure:10560: checking if configuration info should be browsable" >&5
+echo "configure:10559: checking if configuration info should be browsable" >&5
 
 # Check whether --enable-config-info or --disable-config-info was given.
 if test "${enable_config_info+set}" = set; then
@@ -10580,7 +10579,7 @@ EOF
 
 
 echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6
-echo "configure:10584: checking if new-style forms-based options screen should be used" >&5
+echo "configure:10583: checking if new-style forms-based options screen should be used" >&5
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
 if test "${enable_forms_options+set}" = set; then
@@ -10604,7 +10603,7 @@ EOF
 
 
 echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6
-echo "configure:10608: checking if old-style options menu should be used" >&5
+echo "configure:10607: checking if old-style options menu should be used" >&5
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
 if test "${enable_menu_options+set}" = set; then
@@ -10628,7 +10627,7 @@ EOF
 
 
 echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6
-echo "configure:10632: checking if experimental address-list page should be used" >&5
+echo "configure:10631: checking if experimental address-list page should be used" >&5
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
 if test "${enable_addrlist_page+set}" = set; then
@@ -10651,32 +10650,8 @@ test $use_addrlist_page != no && cat >> confdefs.h <<\EOF
 EOF
 
 
-echo $ac_n "checking if experimental alternative line-edit bindings should be used""... $ac_c" 1>&6
-echo "configure:10656: checking if experimental alternative line-edit bindings should be used" >&5
-
-# Check whether --enable-alt-bindings or --disable-alt-bindings was given.
-if test "${enable_alt_bindings+set}" = set; then
-  enableval="$enable_alt_bindings"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
-    use_alt_bindings=$enableval 
-  else
-    use_alt_bindings=no
-  fi
-else
-  enableval=no 
-  use_alt_bindings=no
-  
-fi
-
-echo "$ac_t""$use_alt_bindings" 1>&6
-test $use_alt_bindings != no && cat >> confdefs.h <<\EOF
-#define EXP_ALT_BINDINGS 1
-EOF
-
-
 echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6
-echo "configure:10680: checking if color-style code should be used" >&5
+echo "configure:10655: checking if color-style code should be used" >&5
 
 # Check whether --enable-color-style or --disable-color-style was given.
 if test "${enable_color_style+set}" = set; then
@@ -10724,7 +10699,7 @@ EOF
 	echo "$ac_t""yes" 1>&6
 
 	echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6
-echo "configure:10728: checking for location of style-sheet file" >&5
+echo "configure:10703: checking for location of style-sheet file" >&5
 	LYNX_LSS_FILE=$cf_libdir/lynx.lss
 	cat >> confdefs.h <<EOF
 #define LYNX_LSS_FILE "$LYNX_LSS_FILE"
@@ -10742,7 +10717,7 @@ test ".$ac_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe
 
 if test "$use_dft_colors" != no ; then
 echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6
-echo "configure:10746: checking if you want to use default-colors" >&5
+echo "configure:10721: checking if you want to use default-colors" >&5
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
 if test "${enable_default_colors+set}" = set; then
@@ -10767,7 +10742,7 @@ EOF
 fi
 
 echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6
-echo "configure:10771: checking if experimental keyboard-layout logic should be used" >&5
+echo "configure:10746: checking if experimental keyboard-layout logic should be used" >&5
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
 if test "${enable_kbd_layout+set}" = set; then
@@ -10790,56 +10765,9 @@ test $use_kbd_layout != no && cat >> confdefs.h <<\EOF
 EOF
 
 
-echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6
-echo "configure:10795: checking if experimental JavaScript support should be used" >&5
-
-# Check whether --enable-libjs or --disable-libjs was given.
-if test "${enable_libjs+set}" = set; then
-  enableval="$enable_libjs"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
-    use_libjs=$enableval 
-  else
-    use_libjs=no
-  fi
-else
-  enableval=no 
-  use_libjs=no
-  
-fi
-
-echo "$ac_t""$use_libjs" 1>&6
-test $use_libjs != no && cat >> confdefs.h <<\EOF
-#define EXP_LIBJS 1
-EOF
-
-
-echo $ac_n "checking if experimental persistent-cookie logic should be used""... $ac_c" 1>&6
-echo "configure:10819: checking if experimental persistent-cookie logic should be used" >&5
-
-# Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
-if test "${enable_persistent_cookies+set}" = set; then
-  enableval="$enable_persistent_cookies"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
-    use_filed_cookies=$enableval 
-  else
-    use_filed_cookies=no
-  fi
-else
-  enableval=no 
-  use_filed_cookies=no
-  
-fi
-
-echo "$ac_t""$use_filed_cookies" 1>&6
-test $use_filed_cookies != no && cat >> confdefs.h <<\EOF
-#define EXP_PERSISTENT_COOKIES 1
-EOF
-
 
 echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6
-echo "configure:10843: checking if html source should be colorized" >&5
+echo "configure:10771: checking if html source should be colorized" >&5
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
 if test "${enable_prettysrc+set}" = set; then
@@ -10863,7 +10791,7 @@ EOF
 
 
 echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6
-echo "configure:10867: checking if source caching should be used" >&5
+echo "configure:10795: checking if source caching should be used" >&5
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
 if test "${enable_source_cache+set}" = set; then
@@ -10889,8 +10817,32 @@ EOF
 
 
 
+echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6
+echo "configure:10822: checking if alternative line-edit bindings should be used" >&5
+
+# Check whether --enable-alt-bindings or --disable-alt-bindings was given.
+if test "${enable_alt_bindings+set}" = set; then
+  enableval="$enable_alt_bindings"
+  test "$enableval" != yes && enableval=no
+  if test "$enableval" != "no" ; then
+    use_alt_bindings=$enableval 
+  else
+    use_alt_bindings=yes
+  fi
+else
+  enableval=no 
+  use_alt_bindings=yes
+  
+fi
+
+echo "$ac_t""$use_alt_bindings" 1>&6
+test $use_alt_bindings != no && cat >> confdefs.h <<\EOF
+#define EXP_ALT_BINDINGS 1
+EOF
+
+
 echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6
-echo "configure:10894: checking if you want to use extended HTML DTD logic" >&5
+echo "configure:10846: checking if you want to use extended HTML DTD logic" >&5
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
 if test "${enable_extended_dtd+set}" = set; then
@@ -10914,7 +10866,7 @@ EOF
 
 
 echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6
-echo "configure:10918: checking if partial-display should be used" >&5
+echo "configure:10870: checking if partial-display should be used" >&5
 
 # Check whether --enable-partial or --disable-partial was given.
 if test "${enable_partial+set}" = set; then
@@ -10938,7 +10890,7 @@ EOF
 
 
 echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6
-echo "configure:10942: checking if you want to use external commands" >&5
+echo "configure:10894: checking if you want to use external commands" >&5
 
 # Check whether --enable-externs or --disable-externs was given.
 if test "${enable_externs+set}" = set; then
@@ -10962,7 +10914,7 @@ EOF
 
 
 echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6
-echo "configure:10966: checking if you want to use setfont support" >&5
+echo "configure:10918: checking if you want to use setfont support" >&5
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
 if test "${enable_font_switch+set}" = set; then
@@ -10986,7 +10938,7 @@ EOF
 
 
 echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6
-echo "configure:10990: checking if you want cgi-link support" >&5
+echo "configure:10942: checking if you want cgi-link support" >&5
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
 if test "${enable_cgi_links+set}" = set; then
@@ -11005,7 +10957,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6
-echo "configure:11009: checking if you want exec-links support" >&5
+echo "configure:10961: checking if you want exec-links support" >&5
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
 if test "${enable_exec_links+set}" = set; then
@@ -11024,7 +10976,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6
-echo "configure:11028: checking if you want exec-scripts support" >&5
+echo "configure:10980: checking if you want exec-scripts support" >&5
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
 if test "${enable_exec_scripts+set}" = set; then
@@ -11043,7 +10995,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6
-echo "configure:11047: checking if you want internal-links feature" >&5
+echo "configure:10999: checking if you want internal-links feature" >&5
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
 if test "${enable_internal_links+set}" = set; then
@@ -11067,7 +11019,7 @@ EOF
 
 
 echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6
-echo "configure:11071: checking if you want to fork NSL requests" >&5
+echo "configure:11023: checking if you want to fork NSL requests" >&5
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
 if test "${enable_nsl_fork+set}" = set; then
@@ -11091,7 +11043,7 @@ EOF
 
 
 echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6
-echo "configure:11095: checking if you want to log URL requests via syslog" >&5
+echo "configure:11047: checking if you want to log URL requests via syslog" >&5
 
 # Check whether --enable-syslog or --disable-syslog was given.
 if test "${enable_syslog+set}" = set; then
@@ -11114,8 +11066,32 @@ test $use_syslog = yes && cat >> confdefs.h <<\EOF
 EOF
 
 
+echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6
+echo "configure:11071: checking if persistent-cookie logic should be used" >&5
+
+# Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
+if test "${enable_persistent_cookies+set}" = set; then
+  enableval="$enable_persistent_cookies"
+  test "$enableval" != yes && enableval=no
+  if test "$enableval" != "no" ; then
+    use_filed_cookies=$enableval 
+  else
+    use_filed_cookies=yes
+  fi
+else
+  enableval=no 
+  use_filed_cookies=yes
+  
+fi
+
+echo "$ac_t""$use_filed_cookies" 1>&6
+test $use_filed_cookies != no && cat >> confdefs.h <<\EOF
+#define EXP_PERSISTENT_COOKIES 1
+EOF
+
+
 echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6
-echo "configure:11119: checking if you want to underline links" >&5
+echo "configure:11095: checking if you want to underline links" >&5
 
 # Check whether --enable-underlines or --disable-underlines was given.
 if test "${enable_underlines+set}" = set; then
@@ -11139,7 +11115,7 @@ EOF
 
 
 echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6
-echo "configure:11143: checking if help files should be gzip'ed" >&5
+echo "configure:11119: checking if help files should be gzip'ed" >&5
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
 if test "${enable_gzip_help+set}" = set; then
@@ -11168,7 +11144,7 @@ fi
 
 
 echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6
-echo "configure:11172: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "configure:11148: checking if you want to use zlib for decompression of some gzip files" >&5
 
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -11185,12 +11161,12 @@ if test ".$use_zlib" != ".no" ; then
 	cf_cv_have_lib_z=no
 	cf_libdir=""
 	echo $ac_n "checking for gzopen""... $ac_c" 1>&6
-echo "configure:11189: checking for gzopen" >&5
+echo "configure:11165: checking for gzopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11194 "configure"
+#line 11170 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gzopen(); below.  */
@@ -11213,7 +11189,7 @@ gzopen();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gzopen=yes"
 else
@@ -11233,17 +11209,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:11237: checking for gzopen in -lz" >&5
+echo "configure:11213: checking for gzopen in -lz" >&5
 		LIBS="-lz $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 11240 "configure"
+#line 11216 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:11247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_z=yes
@@ -11270,17 +11246,17 @@ test "$prefix" != /usr           && cf_search="$cf_search /usr/lib /usr/lib/z"
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6
-echo "configure:11274: checking for -lz in $cf_libdir" >&5
+echo "configure:11250: checking for -lz in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lz $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 11277 "configure"
+#line 11253 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:11284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_z=yes
@@ -11316,7 +11292,7 @@ EOF
 fi
 
 echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6
-echo "configure:11320: checking if you want to exclude FINGER code" >&5
+echo "configure:11296: checking if you want to exclude FINGER code" >&5
 
 # Check whether --enable-finger or --disable-finger was given.
 if test "${enable_finger+set}" = set; then
@@ -11340,7 +11316,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6
-echo "configure:11344: checking if you want to exclude GOPHER code" >&5
+echo "configure:11320: checking if you want to exclude GOPHER code" >&5
 
 # Check whether --enable-gopher or --disable-gopher was given.
 if test "${enable_gopher+set}" = set; then
@@ -11364,7 +11340,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6
-echo "configure:11368: checking if you want to exclude NEWS code" >&5
+echo "configure:11344: checking if you want to exclude NEWS code" >&5
 
 # Check whether --enable-news or --disable-news was given.
 if test "${enable_news+set}" = set; then
@@ -11388,7 +11364,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6
-echo "configure:11392: checking if you want to exclude FTP code" >&5
+echo "configure:11368: checking if you want to exclude FTP code" >&5
 
 # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
@@ -11417,7 +11393,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 $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6
-echo "configure:11421: checking if directory-editor code should be used" >&5
+echo "configure:11397: checking if directory-editor code should be used" >&5
 
 # Check whether --enable-dired or --disable-dired was given.
 if test "${enable_dired+set}" = set; then
@@ -11443,7 +11419,7 @@ EOF
 
 
 	echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6
-echo "configure:11447: checking if you wish to allow extracting from archives via DirEd" >&5
+echo "configure:11423: checking if you wish to allow extracting from archives via DirEd" >&5
 	
 # Check whether --enable-dired-archive or --disable-dired-archive was given.
 if test "${enable_dired_archive+set}" = set; then
@@ -11462,7 +11438,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow users to redefine DirEd keys""... $ac_c" 1>&6
-echo "configure:11466: checking if you wish to allow users to redefine DirEd keys" >&5
+echo "configure:11442: checking if you wish to allow users to redefine DirEd keys" >&5
 	
 # Check whether --enable-dired-override or --disable-dired-override was given.
 if test "${enable_dired_override+set}" = set; then
@@ -11488,7 +11464,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6
-echo "configure:11492: checking if you wish to allow permissions commands via DirEd" >&5
+echo "configure:11468: checking if you wish to allow permissions commands via DirEd" >&5
 	
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
 if test "${enable_dired_permit+set}" = set; then
@@ -11514,7 +11490,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6
-echo "configure:11518: checking if you wish to allow executable-permission commands via DirEd" >&5
+echo "configure:11494: checking if you wish to allow executable-permission commands via DirEd" >&5
 	
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
 if test "${enable_dired_xpermit+set}" = set; then
@@ -11533,7 +11509,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11537: checking if you wish to allow "tar" commands from DirEd" >&5
+echo "configure:11513: checking if you wish to allow "tar" commands from DirEd" >&5
 	
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
 if test "${enable_dired_tar+set}" = set; then
@@ -11559,7 +11535,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11563: checking if you wish to allow "uudecode" commands from DirEd" >&5
+echo "configure:11539: checking if you wish to allow "uudecode" commands from DirEd" >&5
 	
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
 if test "${enable_dired_uudecode+set}" = set; then
@@ -11585,7 +11561,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11589: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
+echo "configure:11565: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
 	
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
 if test "${enable_dired_zip+set}" = set; then
@@ -11611,7 +11587,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11615: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
+echo "configure:11591: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
 	
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
 if test "${enable_dired_gzip+set}" = set; then
@@ -11638,7 +11614,7 @@ fi
 fi
 
 echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6
-echo "configure:11642: checking if you want long-directory listings" >&5
+echo "configure:11618: checking if you want long-directory listings" >&5
 
 # Check whether --enable-long-list or --disable-long-list was given.
 if test "${enable_long_list+set}" = set; then
@@ -11664,7 +11640,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6
-echo "configure:11668: checking if parent-directory references are permitted" >&5
+echo "configure:11644: checking if parent-directory references are permitted" >&5
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
 if test "${enable_parent_dir_refs+set}" = set; then
@@ -11684,7 +11660,7 @@ echo "$ac_t""$enableval" 1>&6
 
 
 echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6
-echo "configure:11688: checking if we can include termio.h with curses" >&5
+echo "configure:11664: checking if we can include termio.h with curses" >&5
 if eval "test \"`echo '$''{'cf_cv_termio_and_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11693,7 +11669,7 @@ else
     CFLAGS="$CFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat > conftest.$ac_ext <<EOF
-#line 11697 "configure"
+#line 11673 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -11702,7 +11678,7 @@ int main() {
 putchar(0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:11706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_curses=yes
 else
diff --git a/configure.in b/configure.in
index b6041fff..ea491fda 100644
--- a/configure.in
+++ b/configure.in
@@ -569,14 +569,6 @@ CF_ARG_ENABLE(addrlist-page,
 AC_MSG_RESULT($use_addrlist_page)
 test $use_addrlist_page != no && AC_DEFINE(EXP_ADDRLIST_PAGE)
 
-AC_MSG_CHECKING(if experimental alternative line-edit bindings should be used)
-CF_ARG_ENABLE(alt-bindings,
-[  --enable-alt-bindings   use experimental line-edit bindings],
-	[use_alt_bindings=$enableval],
-	[use_alt_bindings=no])
-AC_MSG_RESULT($use_alt_bindings)
-test $use_alt_bindings != no && AC_DEFINE(EXP_ALT_BINDINGS)
-
 AC_MSG_CHECKING(if color-style code should be used)
 CF_ARG_ENABLE(color-style,
 [  --enable-color-style    use optional/experimental color style],
@@ -634,21 +626,13 @@ CF_ARG_ENABLE(kbd-layout,
 AC_MSG_RESULT($use_kbd_layout)
 test $use_kbd_layout != no && AC_DEFINE(EXP_KEYBOARD_LAYOUT)
 
-AC_MSG_CHECKING(if experimental JavaScript support should be used)
-CF_ARG_ENABLE(libjs,
-[  --enable-libjs          use experimental JavaScript support (Mozilla libjs)],
-	[use_libjs=$enableval],
-	[use_libjs=no])
-AC_MSG_RESULT($use_libjs)
-test $use_libjs != no && AC_DEFINE(EXP_LIBJS)
-
-AC_MSG_CHECKING(if experimental persistent-cookie logic should be used)
-CF_ARG_ENABLE(persistent-cookies,
-[  --enable-persistent-cookies  use experimental persistent-cookie support],
-	[use_filed_cookies=$enableval],
-	[use_filed_cookies=no])
-AC_MSG_RESULT($use_filed_cookies)
-test $use_filed_cookies != no && AC_DEFINE(EXP_PERSISTENT_COOKIES)
+dnl AC_MSG_CHECKING(if experimental JavaScript support should be used)
+dnl CF_ARG_ENABLE(libjs,
+dnl [  --enable-libjs          use experimental JavaScript support (Mozilla libjs)],
+dnl 	[use_libjs=$enableval],
+dnl 	[use_libjs=no])
+dnl AC_MSG_RESULT($use_libjs)
+dnl test $use_libjs != no && AC_DEFINE(EXP_LIBJS)
 
 AC_MSG_CHECKING(if html source should be colorized)
 CF_ARG_ENABLE(prettysrc,
@@ -673,6 +657,14 @@ dnl --------------------------------------------------------------------------
 CF_HELP_MESSAGE(
 Miscellaneous Options:)
 
+AC_MSG_CHECKING(if alternative line-edit bindings should be used)
+CF_ARG_ENABLE(alt-bindings,
+[  --disable-alt-bindings  disable alternative line-edit bindings],
+	[use_alt_bindings=$enableval],
+	[use_alt_bindings=yes])
+AC_MSG_RESULT($use_alt_bindings)
+test $use_alt_bindings != no && AC_DEFINE(EXP_ALT_BINDINGS)
+
 AC_MSG_CHECKING(if you want to use extended HTML DTD logic)
 CF_ARG_DISABLE(extended-dtd,
 [  --disable-extended-dtd  disable extended HTML DTD logic],
@@ -747,6 +739,14 @@ CF_ARG_ENABLE(syslog,
 AC_MSG_RESULT($use_syslog)
 test $use_syslog = yes && AC_DEFINE(SYSLOG_REQUESTED_URLS)
 
+AC_MSG_CHECKING(if persistent-cookie logic should be used)
+CF_ARG_ENABLE(persistent-cookies,
+[  --disable-persistent-cookies  disable persistent-cookie support],
+	[use_filed_cookies=$enableval],
+	[use_filed_cookies=yes])
+AC_MSG_RESULT($use_filed_cookies)
+test $use_filed_cookies != no && AC_DEFINE(EXP_PERSISTENT_COOKIES)
+
 AC_MSG_CHECKING(if you want to underline links)
 CF_ARG_ENABLE(underlines,
 [  --enable-underlines     underline links rather than using boldface],
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index c0299455..b65da922 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -485,7 +485,7 @@ file generated at runtime:
 
 <pre>
 
-                    Options Menu (Lynx Version 2.8.1pre.2)
+                    Options Menu (Lynx Version 2.8.2pre.6)
 
       Accept Changes - Reset Changes Left Arrow cancels changes <A
 HREF="keystrokes/option_help.html">HELP!</A>
@@ -498,26 +498,28 @@ HREF="keystrokes/option_help.html">HELP!</A>
   Emacs keys                       : [OFF]
   Keypad mode                      : [Numbers act as arrows.............]
   Personal mail address            : __________________________________________
-  Popups for select fields         : [ON.]
   Searching type                   : [Case insensitive]
   Show color                       : [ON....]
   Show cursor                      : [OFF]
-  User mode                        : [Novice......]
-  Verbose images                   : [OFF]
+  User mode                        : [Advanced....]
   VI keys                          : [OFF]
+  Display character set            : [Western (ISO-8859-1)...........]
   X Display                        : __________________________________________
 
+  Document Layout
+  Assumed document character set   : [iso-8859-1......]
+  Raw 8-bit                        : [ON.]
+  HTML error recovery              : [strict (SortaSGML mode)]
+  Popups for select fields         : [ON.]
+  Show images                      : [as labels]
+  Verbose images                   : [show filename]
+
   Bookmark Options
   Multi-bookmarks                  : [OFF.....]
   Bookmarks file                   : __________________________________________
 
-  Character Set Options
-  Assumed document character set   : [iso-8859-1......]
-  Display character set            : [Western (ISO-8859-1)...........]
-  Raw 8-bit                        : [ON.]
-
   File Management Options
-  Ftp sort criteria                : [By Name]
+  FTP sort criteria                : [By Name]
   Local directory sort criteria    : [Mixed style......]
 
   Headers transferred to remote server
@@ -536,24 +538,24 @@ compiled into Lynx, and is accessed by setting FORMS_OPTIONS true in your
 <A HREF="#lynx.cfg">lynx.cfg</A> file.
 
 <pre>
-                      Options Menu
+             Options Menu (Lynx Version 2.8.2pre.6)
 
-     E)ditor                      : emacs
-     D)ISPLAY variable            : aixtest.cc.ukans.edu:0.0
+     (E)ditor                     : emacs
+     (D)ISPLAY variable           : aixtest.cc.ukans.edu:0.0
      mu(L)ti-bookmarks: OFF       B)ookmark file: lynx_bookmarks.html
-     F)TP sort criteria           : By Filename
-     P)ersonal mail address       : montulli@netscape.com
-     S)earching type              : CASE INSENSITIVE
+     (F)TP sort criteria          : By Filename
+     (P)ersonal mail address      : montulli@netscape.com
+     (S)earching type             : CASE INSENSITIVE
      preferred document lan(G)uage: en
      preferred document c(H)arset : NONE
-     display (C)haracter set      : ISO Latin 1
+     display (C)haracter set      : Western (ISO-8859-1)
      raw 8-bit or CJK m(O)de      : ON      show color (&amp;)  : OFF
-     V)I keys: OFF    e(M)acs keys: OFF     sho(W) dot files: OFF
+     (V)I keys: OFF   e(M)acs keys: OFF     sho(W) dot files: OFF
      popups for selec(T) fields   : ON      show cursor (@) : OFF
-     K)eypad mode                 : Numbers act as arrows
+     (K)eypad mode                : Numbers act as arrows
      li(N)e edit style            : Default Binding
      l(I)st directory style       : Mixed style
-     U)ser mode                   : Advanced      verbose images (!) : ON
+     (U)ser mode                  : Advanced      verbose images (!) : ON
      user (A)gent                 : [User-Agent header]
      local e(X)ecution links      : FOR LOCAL FILES ONLY
 </pre>
diff --git a/makefile.in b/makefile.in
index c0fb9767..9707d005 100644
--- a/makefile.in
+++ b/makefile.in
@@ -23,7 +23,6 @@ LIBS		= @LIBS@
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
-LN_S		= @LN_S@
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
@@ -34,25 +33,29 @@ VERSION		= 2-8-2
 lynxdir= lynx$(VERSION)
 lynxname= lynx$(VERSION)
 
+## The 'DESTDIR' variable allows you to install the program into a different
+## location, e.g., for packaging, without affecting the compiled-in pathnames.
+DESTDIR=
+
 ## Where you want lynx installed
 bindir= @bindir@
+BINDIR= $(DESTDIR)$(bindir)
 
 ## Where you want the lynx man file installed
 mandir= @mandir@/man1
+MANDIR= $(DESTDIR)$(mandir)
 
 ## Where you want the lynx.cfg file installed
 libdir= @libdir@
+LIBDIR= $(DESTDIR)$(libdir)
 
 ## Where you want the doc-files installed
 docdir= @libdir@/lynx_doc
+DOCDIR= $(DESTDIR)$(docdir)
 
 ## Where you want the help-files installed
 helpdir= @libdir@/lynx_help
-
-## Where your locale data is
-# datadir = @datadir@
-datadir = /usr/local/share
-localedir = $(datadir)/locale
+HELPDIR= $(DESTDIR)$(helpdir)
 
 ##set the relative location of the WWW library Implementation directory,
 ##from this directory
@@ -305,25 +308,25 @@ install: lynx$x install-bin install-man install-cfg @INSTALL_LSS@
 install-full: install install-help install-doc
 	@echo Full installation complete.
 
-install-bin: $(bindir)
+install-bin: $(BINDIR)
 @MSG_DIR_MAKE@	cd po && $(MAKE) CC="$(CC)" install
-	-mv -f $(bindir)/lynx$x $(bindir)/lynx.old
-	$(INSTALL_PROGRAM) lynx$x $(bindir)/
+	-mv -f $(BINDIR)/lynx$x $(BINDIR)/lynx.old
+	$(INSTALL_PROGRAM) lynx$x $(BINDIR)/lynx$x 
 
-install-man : $(mandir)
-	$(INSTALL_DATA) $(srcdir)/lynx.man $(mandir)/lynx.1
+install-man : $(MANDIR)
+	$(INSTALL_DATA) $(srcdir)/lynx.man $(MANDIR)/lynx.1
 
-install-doc : $(docdir)
+install-doc : $(DOCDIR)
 	@echo Copying sample files
 	(cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \
-			       ( cd $(docdir) && tar xf - )
+			       ( cd $(DOCDIR) && tar xf - )
 
 # HPUX 'sed' does not seem to like '=' as pattern delimiter.
 FIX_SED = tr '=' '%'
 #FIX_SED = cat
 
-install-help : $(docdir) $(helpdir)
-	(cd $(helpdir) && rm -rf *)
+install-help : $(DOCDIR) $(HELPDIR)
+	(cd $(HELPDIR) && rm -rf *)
 	@echo Constructing sed-script
 	@ECHO_CC@sed	-e '/^#/d' -e '/^$$/d' \
 		-e 's%\(.*\)=\(.*\@.*\)$$%s=@\1@=\2=g%' \
@@ -331,33 +334,33 @@ install-help : $(docdir) $(helpdir)
 		-e 's%\(.*\)=\(ftp:.*\)$$%s=@\1@=\2=g%' \
 		-e 's%\(.*\)=\(.*\.html\)$$%s=@\1@=\2$(COMPRESS_EXT)=g%' \
 		$(srcdir)/lynx_help/help_files.txt | $(FIX_SED) > \
-		$(helpdir)/help_files.sed
+		$(HELPDIR)/help_files.sed
 	@echo Appending interim-fix for existing html files
 	@ECHO_CC@sed	-e '/^#/d' -e '/[:@]/d' -e '/^$$/d' \
 		-e 's%\(.*\)=\(.*\.html\)$$%s=\2=\2$(COMPRESS_EXT)=g%' \
 		-e 's%\.html=%\\.html=%' \
 		$(srcdir)/lynx_help/help_files.txt | $(FIX_SED) >> \
-		$(helpdir)/help_files.sed
+		$(HELPDIR)/help_files.sed
 	@ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo 's%\$(COMPRESS_EXT)\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g' >> \
-		$(helpdir)/help_files.sed; fi
+		$(HELPDIR)/help_files.sed; fi
 	@echo Translating/copying html files
 	@ECHO_CC@$(SHELL) -c 'cd $(srcdir)/lynx_help && ( \
 		dirs=keystrokes; \
-		(cd $(helpdir) && mkdir $$dirs 2>/dev/null ) ; \
+		(cd $(HELPDIR) && mkdir $$dirs 2>/dev/null ) ; \
 		files="*.html */*.html" ; \
 		for f in $$files ; do \
-			sed -f $(helpdir)/help_files.sed $$f > $(helpdir)/$$f ; \
+			sed -f $(HELPDIR)/help_files.sed $$f > $(HELPDIR)/$$f ; \
 		done ; \
 		if test "$(COMPRESS_PROG)" != "" ; then \
-			(cd $(helpdir) && $(COMPRESS_PROG) $$files ) \
+			(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
 		fi ; \
 		)'
-	-rm -f $(helpdir)/help_files.sed
+	-rm -f $(HELPDIR)/help_files.sed
 	@echo Updating $(libdir)/lynx.cfg
-	$(SHELL) -c 'if test -f $(libdir)/lynx.cfg ; then \
-		mv $(libdir)/lynx.cfg $(libdir)/lynx.tmp ; \
+	$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \
+		mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
 	else \
-		cp $(srcdir)/lynx.cfg $(libdir)/lynx.tmp ; \
+		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
 	fi'
 	@echo Updating $(libdir)/lynx.cfg to point to installed help-files
 	@ECHO_CC@sed	-e '/^HELPFILE:http/s@^@#@' \
@@ -366,14 +369,14 @@ install-help : $(docdir) $(helpdir)
 		-e '/^[A-Z_]*:/s@/PATH_TO/lynx_doc@$(docdir)@' \
 		-e '/^HELPFILE:file/s@$$@$(COMPRESS_EXT)@' \
 		-e '/^HELPFILE:file/s@$(COMPRESS_EXT)$(COMPRESS_EXT)$$@$(COMPRESS_EXT)@' \
-		$(libdir)/lynx.tmp >$(libdir)/lynx.cfg
-	chmod 644 $(libdir)/lynx.cfg
-	-rm -f $(libdir)/lynx.tmp
-	$(INSTALL_DATA) COPYHEADER $(docdir)/COPYHEADER
-	$(INSTALL_DATA) COPYING    $(docdir)/COPYING
-	cd $(helpdir) && ( \
-		ln $(docdir)/COPYHEADER . || cp $(docdir)/COPYHEADER . ; \
-		ln $(docdir)/COPYING    . || cp $(docdir)/COPYING . )
+		$(LIBDIR)/lynx.tmp >$(LIBDIR)/lynx.cfg
+	chmod 644 $(LIBDIR)/lynx.cfg
+	-rm -f $(LIBDIR)/lynx.tmp
+	$(INSTALL_DATA) COPYHEADER $(DOCDIR)/COPYHEADER
+	$(INSTALL_DATA) COPYING    $(DOCDIR)/COPYING
+	cd $(HELPDIR) && ( \
+		ln $(DOCDIR)/COPYHEADER . || cp $(DOCDIR)/COPYHEADER . ; \
+		ln $(DOCDIR)/COPYING    . || cp $(DOCDIR)/COPYING . )
 
 LYHelp.h : LYHelp.hin
 	@echo Constructing sed-script
@@ -403,22 +406,22 @@ cfg_defs.h : $(srcdir)/cfg_defs.sh config.cache lynx_cfg.h
 	@rm -f $@
 	PATH=$(srcdir):$$PATH; export PATH; $(SHELL) -c '$(srcdir)/cfg_defs.sh'
 
-install-cfg : $(libdir)
-	-mv -f $(libdir)/lynx.cfg $(libdir)/lynx.oldcfg
-	$(INSTALL_DATA) $(srcdir)/lynx.cfg $(libdir)/lynx.cfg
+install-cfg : $(LIBDIR)
+	-mv -f $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.oldcfg
+	$(INSTALL_DATA) $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg
 
-install-lss : $(libdir)
-	-mv -f $(libdir)/lynx.lss $(libdir)/lynx.oldlss
-	$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(libdir)/lynx.lss
+install-lss : $(LIBDIR)
+	-mv -f $(LIBDIR)/lynx.lss $(LIBDIR)/lynx.oldlss
+	$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(LIBDIR)/lynx.lss
 
 uninstall:
 @MSG_DIR_MAKE@	cd po && $(MAKE) CC="$(CC)" uninstall
-	-rm -f $(bindir)/lynx$x
-	-rm -f $(mandir)/lynx.1
-	-rm -f $(libdir)/lynx.cfg
-	-rm -f $(libdir)/lynx.lss
-	-rm -rf $(helpdir)
-	-rm -rf $(docdir)
-
-$(bindir) $(mandir) $(libdir) $(helpdir) $(docdir) :
+	-rm -f $(BINDIR)/lynx$x
+	-rm -f $(MANDIR)/lynx.1
+	-rm -f $(LIBDIR)/lynx.cfg
+	-rm -f $(LIBDIR)/lynx.lss
+	-rm -rf $(HELPDIR)
+	-rm -rf $(DOCDIR)
+
+$(BINDIR) $(MANDIR) $(LIBDIR) $(HELPDIR) $(DOCDIR) :
 	$(srcdir)/mkdirs.sh $@
diff --git a/po/lynx.pot b/po/lynx.pot
index c72ef978..cdd31be8 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -1,1959 +1,1963 @@
 msgid ""
 msgstr ""
-"Date: 1999-05-20 07:01:21-0400\n"
+"Date: 1999-05-25 07:12:28-0400\n"
 "From: Thomas Dickey,,, <tom@dickey-ppp>\n"
 "Content-Type: text/plain; charset=\n"
 "Xgettext-Options: --default-domain=lynx --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
 "Files: LYMessages.c WWW/Library/Implementation/HTAABrow.c WWW/Library/Implementation/HTAccess.c WWW/Library/Implementation/HTFTP.c WWW/Library/Implementation/HTFile.c WWW/Library/Implementation/HTFinger.c WWW/Library/Implementation/HTGopher.c WWW/Library/Implementation/HTNews.c WWW/Library/Implementation/HTTCP.c WWW/Library/Implementation/HTTP.c WWW/Library/Implementation/HTTelnet.c WWW/Library/Implementation/HTWAIS.c WWW/Library/Implementation/HTWSRC.c src/GridText.c src/HTAlert.c src/HTML.c src/LYBookmark.c src/LYCgi.c src/LYClean.c src/LYCookie.c src/LYCurses.c src/LYDownload.c src/LYHistory.c src/LYLeaks.c src/LYList.c src/LYLocal.c src/LYMail.c src/LYMain.c src/LYMainLoop.c src/LYNews.c src/LYOptions.c src/LYPrint.c src/LYReadCFG.c src/LYShowInfo.c src/LYStyle.c src/LYTraversal.c src/LYUpload.c src/LYUtils.c src/LYrcFile.c\n"
 
-#: LYMessages.c:24
+#: LYMessages.c:30
 msgid "Alert!: %s"
 msgstr ""
 
-#: LYMessages.c:25
+#: LYMessages.c:31
 msgid "Welcome"
 msgstr ""
 
-#: LYMessages.c:26 LYMessages.c:27
+#: LYMessages.c:32 LYMessages.c:33
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: LYMessages.c:29 LYMessages.c:30
+#: LYMessages.c:35 LYMessages.c:36
 msgid "Really exit from Lynx?"
 msgstr ""
 
 #. VMS
-#: LYMessages.c:32
+#: LYMessages.c:38
 msgid "Connection interrupted."
 msgstr ""
 
-#: LYMessages.c:33
+#: LYMessages.c:39
 msgid "Data transfer interrupted."
 msgstr ""
 
-#: LYMessages.c:34
+#: LYMessages.c:40
 msgid "Cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:35
+#: LYMessages.c:41
 msgid "Cancelling!"
 msgstr ""
 
-#: LYMessages.c:36
+#: LYMessages.c:42
 msgid "Excellent!!!"
 msgstr ""
 
-#: LYMessages.c:37
+#: LYMessages.c:43
 msgid "Done!"
 msgstr ""
 
-#: LYMessages.c:38
+#: LYMessages.c:44
 msgid "Bad request!"
 msgstr ""
 
-#: LYMessages.c:39
+#: LYMessages.c:45
 msgid "previous"
 msgstr ""
 
-#: LYMessages.c:40
+#: LYMessages.c:46
 msgid "next screen"
 msgstr ""
 
-#: LYMessages.c:41
+#: LYMessages.c:47
 msgid "HELP!"
 msgstr ""
 
-#: LYMessages.c:42
+#: LYMessages.c:48
 msgid ", help on "
 msgstr ""
 
 #. #define HELP
-#: LYMessages.c:44
+#: LYMessages.c:50
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr ""
 
 #. #define MOREHELP
-#: LYMessages.c:46
+#: LYMessages.c:52
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr ""
 
-#: LYMessages.c:47
+#: LYMessages.c:53
 msgid "-- press space for next page --"
 msgstr ""
 
 #. Forms messages
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:51
+#: LYMessages.c:57
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:53
+#: LYMessages.c:59
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (^Ve for editor)."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:55
+#: LYMessages.c:61
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:57
+#: LYMessages.c:63
 msgid "(Form field) Enter text.  Use <return> to submit ('x' for no cache)."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:59
+#: LYMessages.c:65
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:61
+#: LYMessages.c:67
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:63
+#: LYMessages.c:69
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:65
+#: LYMessages.c:71
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:67
+#: LYMessages.c:73
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:69
+#: LYMessages.c:75
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:71
+#: LYMessages.c:77
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr ""
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:73
+#: LYMessages.c:79
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:75
+#: LYMessages.c:81
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr ""
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:83
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:79
+#: LYMessages.c:85
 msgid "Submit ('x' for no cache) to "
 msgstr ""
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:81
+#: LYMessages.c:87
 msgid "Submit to "
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:89
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr ""
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:85
+#: LYMessages.c:91
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:87
+#: LYMessages.c:93
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:89
+#: LYMessages.c:95
 msgid "Submit mailto form to "
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:91
+#: LYMessages.c:97
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:93
+#: LYMessages.c:99
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr ""
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:95
+#: LYMessages.c:101
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr ""
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:97
+#: LYMessages.c:103
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:99
+#: LYMessages.c:105
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr ""
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:107
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr ""
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:109
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr ""
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:105
+#: LYMessages.c:111
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr ""
 
-#: LYMessages.c:106
+#: LYMessages.c:112
 msgid "Submitting form..."
 msgstr ""
 
-#: LYMessages.c:107
+#: LYMessages.c:113
 msgid "Resetting form..."
 msgstr ""
 
 #. #define RELOADING_FORM
-#: LYMessages.c:109
+#: LYMessages.c:115
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr ""
 
-#: LYMessages.c:110
+#: LYMessages.c:116
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr ""
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:113
+#: LYMessages.c:119
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr ""
 
-#: LYMessages.c:114
+#: LYMessages.c:120
 msgid "The resource requested is not available at this time."
 msgstr ""
 
-#: LYMessages.c:115
+#: LYMessages.c:121
 msgid "Enter Lynx keystroke command: "
 msgstr ""
 
-#: LYMessages.c:116
+#: LYMessages.c:122
 msgid "Looking up "
 msgstr ""
 
-#: LYMessages.c:117
+#: LYMessages.c:123
 msgid "Getting %s"
 msgstr ""
 
-#: LYMessages.c:118
+#: LYMessages.c:124
 msgid "Skipping %s"
 msgstr ""
 
-#: LYMessages.c:119
+#: LYMessages.c:125
 msgid "Using %s"
 msgstr ""
 
-#: LYMessages.c:120
+#: LYMessages.c:126
 msgid "Illegal URL: %s"
 msgstr ""
 
-#: LYMessages.c:121
+#: LYMessages.c:127
 msgid "Badly formed address %s"
 msgstr ""
 
-#: LYMessages.c:122
+#: LYMessages.c:128
 msgid "URL: %s"
 msgstr ""
 
-#: LYMessages.c:123
+#: LYMessages.c:129
 msgid "Unable to access WWW file!!!"
 msgstr ""
 
-#: LYMessages.c:124
+#: LYMessages.c:130
 msgid "This is a searchable index.  Use %s to search."
 msgstr ""
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:126
+#: LYMessages.c:132
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr ""
 
-#: LYMessages.c:127
+#: LYMessages.c:133
 msgid "You have entered an invalid link number."
 msgstr ""
 
 #. #define SOURCE_HELP
-#: LYMessages.c:129
+#: LYMessages.c:135
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr ""
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:131
+#: LYMessages.c:137
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:133
+#: LYMessages.c:139
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:135
+#: LYMessages.c:141
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:137
+#: LYMessages.c:143
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:139
+#: LYMessages.c:145
 msgid "  O)ther cmds  C)omment  History: <delete>  Bookmarks: V)iew, A)dd, R)emove  \n"
 msgstr ""
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:141
+#: LYMessages.c:147
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:143
+#: LYMessages.c:149
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. mailto
-#: LYMessages.c:146
+#: LYMessages.c:152
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr ""
 
-#: LYMessages.c:147
+#: LYMessages.c:153
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr ""
 
-#: LYMessages.c:148
+#: LYMessages.c:154
 msgid "Mail disallowed!  Cannot submit."
 msgstr ""
 
-#: LYMessages.c:149
+#: LYMessages.c:155
 msgid "Mailto form submission failed!"
 msgstr ""
 
-#: LYMessages.c:150
+#: LYMessages.c:156
 msgid "Mailto form submission Cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:151
+#: LYMessages.c:157
 msgid "Sending form content..."
 msgstr ""
 
-#: LYMessages.c:152
+#: LYMessages.c:158
 msgid "No email address is present in mailto URL!"
 msgstr ""
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:154
+#: LYMessages.c:160
 msgid "Unable to open temporary file for mailto URL!"
 msgstr ""
 
-#: LYMessages.c:155
+#: LYMessages.c:161
 msgid "Comment request cancelled!!!"
 msgstr ""
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:157
+#: LYMessages.c:163
 msgid "Do you wish to include the original message?"
 msgstr ""
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:159
+#: LYMessages.c:165
 msgid "Do you wish to include the preparsed source?"
 msgstr ""
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:161
+#: LYMessages.c:167
 msgid "Spawning your selected editor to edit mail message"
 msgstr ""
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:163
+#: LYMessages.c:169
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr ""
 
-#: LYMessages.c:164
+#: LYMessages.c:170
 msgid "Send this comment?"
 msgstr ""
 
-#: LYMessages.c:165
+#: LYMessages.c:171
 msgid "Send this message?"
 msgstr ""
 
-#: LYMessages.c:166
+#: LYMessages.c:172
 msgid "Sending your message..."
 msgstr ""
 
-#: LYMessages.c:167
+#: LYMessages.c:173
 msgid "Sending your comment:"
 msgstr ""
 
 #. textarea
-#: LYMessages.c:170
+#: LYMessages.c:176
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr ""
 
-#: LYMessages.c:173
+#: LYMessages.c:179
 msgid "file: ACTIONs are disallowed!"
 msgstr ""
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:175
+#: LYMessages.c:181
 msgid "file: URLs via served links are disallowed!"
 msgstr ""
 
-#: LYMessages.c:176
+#: LYMessages.c:182
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr ""
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:178
+#: LYMessages.c:184
 msgid "This special URL is not allowed in external documents!"
 msgstr ""
 
-#: LYMessages.c:179
+#: LYMessages.c:185
 msgid "Press <return> to return to Lynx."
 msgstr ""
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:182
+#: LYMessages.c:188
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr ""
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:186
+#: LYMessages.c:192
 msgid "Type EXIT to return to Lynx.\n"
 msgstr ""
 
 #. UNIX
 #. #define SPAWNING_MSG
-#: LYMessages.c:189
+#: LYMessages.c:195
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr ""
 
 #. VMS
-#: LYMessages.c:192
+#: LYMessages.c:198
 msgid "Spawning is currently disabled."
 msgstr ""
 
-#: LYMessages.c:193
+#: LYMessages.c:199
 msgid "The 'd'ownload command is currently disabled."
 msgstr ""
 
-#: LYMessages.c:194
+#: LYMessages.c:200
 msgid "You cannot download an input field."
 msgstr ""
 
-#: LYMessages.c:195
+#: LYMessages.c:201
 msgid "Form has a mailto action!  Cannot download."
 msgstr ""
 
-#: LYMessages.c:196
+#: LYMessages.c:202
 msgid "You cannot download a mailto: link."
 msgstr ""
 
-#: LYMessages.c:197
+#: LYMessages.c:203
 msgid "You cannot download cookies."
 msgstr ""
 
-#: LYMessages.c:198
+#: LYMessages.c:204
 msgid "You cannot download a printing option."
 msgstr ""
 
-#: LYMessages.c:199
+#: LYMessages.c:205
 msgid "You cannot download an upload option."
 msgstr ""
 
-#: LYMessages.c:200
+#: LYMessages.c:206
 msgid "You cannot download an permit option."
 msgstr ""
 
-#: LYMessages.c:201
+#: LYMessages.c:207
 msgid "This special URL cannot be downloaded!"
 msgstr ""
 
-#: LYMessages.c:202
+#: LYMessages.c:208
 msgid "Nothing to download."
 msgstr ""
 
-#: LYMessages.c:203
+#: LYMessages.c:209
 msgid "Trace ON!"
 msgstr ""
 
-#: LYMessages.c:204
+#: LYMessages.c:210
 msgid "Trace OFF!"
 msgstr ""
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:206
+#: LYMessages.c:212
 msgid "Links will be included for all images!  Reloading..."
 msgstr ""
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:208
+#: LYMessages.c:214
 msgid "Standard image handling restored!  Reloading..."
 msgstr ""
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:210
+#: LYMessages.c:216
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr ""
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:212
+#: LYMessages.c:218
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:213
+#: LYMessages.c:219
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:214
+#: LYMessages.c:220
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr ""
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:216
+#: LYMessages.c:222
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr ""
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:218
+#: LYMessages.c:224
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr ""
 
-#: LYMessages.c:219
+#: LYMessages.c:225
 msgid "Sorry, the document is not an http URL."
 msgstr ""
 
-#: LYMessages.c:220
+#: LYMessages.c:226
 msgid "Sorry, the link is not an http URL."
 msgstr ""
 
-#: LYMessages.c:221
+#: LYMessages.c:227
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr ""
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:223
+#: LYMessages.c:229
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr ""
 
-#: LYMessages.c:224
+#: LYMessages.c:230
 msgid "Not an http URL or form ACTION!"
 msgstr ""
 
-#: LYMessages.c:225
+#: LYMessages.c:231
 msgid "This special URL cannot be a form ACTION!"
 msgstr ""
 
-#: LYMessages.c:226
+#: LYMessages.c:232
 msgid "URL is not in starting realm!"
 msgstr ""
 
-#: LYMessages.c:227
+#: LYMessages.c:233
 msgid "News posting is disabled!"
 msgstr ""
 
-#: LYMessages.c:228
+#: LYMessages.c:234
 msgid "File management support is disabled!"
 msgstr ""
 
-#: LYMessages.c:229
+#: LYMessages.c:235
 msgid "No jump file is currently available."
 msgstr ""
 
-#: LYMessages.c:230
+#: LYMessages.c:236
 msgid "Jump to (use '?' for list): "
 msgstr ""
 
-#: LYMessages.c:231
+#: LYMessages.c:237
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:232
+#: LYMessages.c:238
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr ""
 
-#: LYMessages.c:233
+#: LYMessages.c:239
 msgid "No random URLs have been used thus far."
 msgstr ""
 
-#: LYMessages.c:234
+#: LYMessages.c:240
 msgid "Bookmark features are currently disabled."
 msgstr ""
 
-#: LYMessages.c:235
+#: LYMessages.c:241
 msgid "Execution via bookmarks is disabled."
 msgstr ""
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:237
+#: LYMessages.c:243
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr ""
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:239
+#: LYMessages.c:245
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr ""
 
-#: LYMessages.c:240
+#: LYMessages.c:246
 msgid "ERROR - unable to open bookmark file."
 msgstr ""
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:242
+#: LYMessages.c:248
 msgid "Unable to open bookmark file for deletion of link."
 msgstr ""
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:244
+#: LYMessages.c:250
 msgid "Unable to open scratch file for deletion of link."
 msgstr ""
 
-#: LYMessages.c:246
+#: LYMessages.c:252
 msgid "Error renaming scratch file."
 msgstr ""
 
-#: LYMessages.c:248
+#: LYMessages.c:254
 msgid "Error renaming temporary file."
 msgstr ""
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:250
+#: LYMessages.c:256
 msgid "Unable to copy temporary file for deletion of link."
 msgstr ""
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:252
+#: LYMessages.c:258
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr ""
 
 #. VMS
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:255
+#: LYMessages.c:261
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr ""
 
-#: LYMessages.c:256
+#: LYMessages.c:262
 msgid "Bookmark deletion failed."
 msgstr ""
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:258
+#: LYMessages.c:264
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr ""
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:260
+#: LYMessages.c:266
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr ""
 
-#: LYMessages.c:261
+#: LYMessages.c:267
 msgid "There are no links in this bookmark file!"
 msgstr ""
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:263
+#: LYMessages.c:269
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr ""
 
-#: LYMessages.c:264
+#: LYMessages.c:270
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr ""
 
-#: LYMessages.c:265
+#: LYMessages.c:271
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr ""
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:267
+#: LYMessages.c:273
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr ""
 
-#: LYMessages.c:268
+#: LYMessages.c:274
 msgid "Cannot save form fields/links"
 msgstr ""
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:270
+#: LYMessages.c:276
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr ""
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:272
+#: LYMessages.c:278
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr ""
 
-#: LYMessages.c:273
+#: LYMessages.c:279
 msgid "Malformed address."
 msgstr ""
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:275
+#: LYMessages.c:281
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr ""
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:277
+#: LYMessages.c:283
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr ""
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:279
+#: LYMessages.c:285
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr ""
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:281
+#: LYMessages.c:287
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:283
+#: LYMessages.c:289
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr ""
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:285
+#: LYMessages.c:291
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:287
+#: LYMessages.c:293
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:289
+#: LYMessages.c:295
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr ""
 
-#: LYMessages.c:290
+#: LYMessages.c:296
 msgid "Soft double-quote parsing ON!"
 msgstr ""
 
-#: LYMessages.c:291
+#: LYMessages.c:297
 msgid "Soft double-quote parsing OFF!"
 msgstr ""
 
-#: LYMessages.c:292
+#: LYMessages.c:298
 msgid "Now using TagSoup parsing of HTML."
 msgstr ""
 
-#: LYMessages.c:293
+#: LYMessages.c:299
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr ""
 
-#: LYMessages.c:294
+#: LYMessages.c:300
 msgid "You are already at the end of this document."
 msgstr ""
 
-#: LYMessages.c:295
+#: LYMessages.c:301
 msgid "You are already at the beginning of this document."
 msgstr ""
 
-#: LYMessages.c:296
+#: LYMessages.c:302
 msgid "You are already at page %d of this document."
 msgstr ""
 
-#: LYMessages.c:297
+#: LYMessages.c:303
 msgid "Link number %d already is current."
 msgstr ""
 
-#: LYMessages.c:298
+#: LYMessages.c:304
 msgid "You are already at the first document"
 msgstr ""
 
-#: LYMessages.c:299
+#: LYMessages.c:305
 msgid "There are no links above this line of the document."
 msgstr ""
 
-#: LYMessages.c:300
+#: LYMessages.c:306
 msgid "There are no links below this line of the document."
 msgstr ""
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:302
+#: LYMessages.c:308
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr ""
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:304
+#: LYMessages.c:310
 msgid "You are not on a form submission button or normal link."
 msgstr ""
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:306
+#: LYMessages.c:312
 msgid "One radio button must be checked at all times!"
 msgstr ""
 
-#: LYMessages.c:307
+#: LYMessages.c:313
 msgid "Do you want to go back to the previous document?"
 msgstr ""
 
-#: LYMessages.c:308
+#: LYMessages.c:314
 msgid "Use arrows or tab to move off of field."
 msgstr ""
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:310
+#: LYMessages.c:316
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr ""
 
-#: LYMessages.c:311
+#: LYMessages.c:317
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr ""
 
-#: LYMessages.c:312
+#: LYMessages.c:318
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr ""
 
-#: LYMessages.c:313
+#: LYMessages.c:319
 msgid "Unable to create popup window!"
 msgstr ""
 
-#: LYMessages.c:314
+#: LYMessages.c:320
 msgid "Goto a random URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:315
+#: LYMessages.c:321
 msgid "Goto a non-http URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:316
+#: LYMessages.c:322
 msgid "You are not allowed to goto \"cso:\" URLs"
 msgstr ""
 
-#: LYMessages.c:317
+#: LYMessages.c:323
 msgid "You are not allowed to goto \"file:\" URLs"
 msgstr ""
 
-#: LYMessages.c:318
+#: LYMessages.c:324
 msgid "You are not allowed to goto \"finger:\" URLs"
 msgstr ""
 
-#: LYMessages.c:319
+#: LYMessages.c:325
 msgid "You are not allowed to goto \"ftp:\" URLs"
 msgstr ""
 
-#: LYMessages.c:320
+#: LYMessages.c:326
 msgid "You are not allowed to goto \"gopher:\" URLs"
 msgstr ""
 
-#: LYMessages.c:321
+#: LYMessages.c:327
 msgid "You are not allowed to goto \"http:\" URLs"
 msgstr ""
 
-#: LYMessages.c:322
+#: LYMessages.c:328
 msgid "You are not allowed to goto \"https:\" URLs"
 msgstr ""
 
-#: LYMessages.c:323
+#: LYMessages.c:329
 msgid "You are not allowed to goto \"lynxcgi:\" URLs"
 msgstr ""
 
-#: LYMessages.c:324
+#: LYMessages.c:330
 msgid "You are not allowed to goto \"lynxexec:\" URLs"
 msgstr ""
 
-#: LYMessages.c:325
+#: LYMessages.c:331
 msgid "You are not allowed to goto \"lynxprog:\" URLs"
 msgstr ""
 
-#: LYMessages.c:326
+#: LYMessages.c:332
 msgid "You are not allowed to goto \"mailto:\" URLs"
 msgstr ""
 
-#: LYMessages.c:327
+#: LYMessages.c:333
 msgid "You are not allowed to goto \"news:\" URLs"
 msgstr ""
 
-#: LYMessages.c:328
+#: LYMessages.c:334
 msgid "You are not allowed to goto \"nntp:\" URLs"
 msgstr ""
 
-#: LYMessages.c:329
+#: LYMessages.c:335
 msgid "You are not allowed to goto \"rlogin:\" URLs"
 msgstr ""
 
-#: LYMessages.c:330
+#: LYMessages.c:336
 msgid "You are not allowed to goto \"snews:\" URLs"
 msgstr ""
 
-#: LYMessages.c:331
+#: LYMessages.c:337
 msgid "You are not allowed to goto \"telnet:\" URLs"
 msgstr ""
 
-#: LYMessages.c:332
+#: LYMessages.c:338
 msgid "You are not allowed to goto \"tn3270:\" URLs"
 msgstr ""
 
-#: LYMessages.c:333
+#: LYMessages.c:339
 msgid "You are not allowed to goto \"wais:\" URLs"
 msgstr ""
 
-#: LYMessages.c:334
+#: LYMessages.c:340
 msgid "This special URL is not allowed as a goto!"
 msgstr ""
 
-#: LYMessages.c:335
+#: LYMessages.c:341
 msgid "URL to open: "
 msgstr ""
 
-#: LYMessages.c:336
+#: LYMessages.c:342
 msgid "Edit the current Goto URL: "
 msgstr ""
 
-#: LYMessages.c:337
+#: LYMessages.c:343
 msgid "Edit the previous Goto URL: "
 msgstr ""
 
-#: LYMessages.c:338
+#: LYMessages.c:344
 msgid "Edit a previous Goto URL: "
 msgstr ""
 
-#: LYMessages.c:339
+#: LYMessages.c:345
 msgid "Current document has POST data."
 msgstr ""
 
-#: LYMessages.c:340
+#: LYMessages.c:346
 msgid "Edit this document's URL: "
 msgstr ""
 
-#: LYMessages.c:341
+#: LYMessages.c:347
 msgid "Edit the current link's URL: "
 msgstr ""
 
-#: LYMessages.c:342
+#: LYMessages.c:348
 msgid "You cannot edit File Management URLs"
 msgstr ""
 
-#: LYMessages.c:343
+#: LYMessages.c:349
 msgid "Enter a database query: "
 msgstr ""
 
-#: LYMessages.c:344
+#: LYMessages.c:350
 msgid "Enter a whereis query: "
 msgstr ""
 
-#: LYMessages.c:345
+#: LYMessages.c:351
 msgid "Edit the current query: "
 msgstr ""
 
-#: LYMessages.c:346
+#: LYMessages.c:352
 msgid "Edit the previous query: "
 msgstr ""
 
-#: LYMessages.c:347
+#: LYMessages.c:353
 msgid "Edit a previous query: "
 msgstr ""
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:349
+#: LYMessages.c:355
 msgid "Use Control-R to resubmit the current query."
 msgstr ""
 
-#: LYMessages.c:350
+#: LYMessages.c:356
 msgid "Edit the current shortcut: "
 msgstr ""
 
-#: LYMessages.c:351
+#: LYMessages.c:357
 msgid "Edit the previous shortcut: "
 msgstr ""
 
-#: LYMessages.c:352
+#: LYMessages.c:358
 msgid "Edit a previous shortcut: "
 msgstr ""
 
-#: LYMessages.c:353
+#: LYMessages.c:359
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr ""
 
-#: LYMessages.c:354
+#: LYMessages.c:360
 msgid "Cannot locate jump file!"
 msgstr ""
 
-#: LYMessages.c:355
+#: LYMessages.c:361
 msgid "Cannot open jump file!"
 msgstr ""
 
-#: LYMessages.c:356
+#: LYMessages.c:362
 msgid "Error reading jump file!"
 msgstr ""
 
-#: LYMessages.c:357
+#: LYMessages.c:363
 msgid "Out of memory reading jump file!"
 msgstr ""
 
-#: LYMessages.c:358
+#: LYMessages.c:364
 msgid "Out of memory reading jump table!"
 msgstr ""
 
-#: LYMessages.c:359
+#: LYMessages.c:365
 msgid "No index is currently available."
 msgstr ""
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:361
+#: LYMessages.c:367
 msgid "Do you really want to go to the Main screen?"
 msgstr ""
 
-#: LYMessages.c:362
+#: LYMessages.c:368
 msgid "You are already at main screen!"
 msgstr ""
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:364
+#: LYMessages.c:370
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr ""
 
 #. #define NO_OWNER
-#: LYMessages.c:366
+#: LYMessages.c:372
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr ""
 
-#: LYMessages.c:367
+#: LYMessages.c:373
 msgid "No owner is defined. Use %s?"
 msgstr ""
 
-#: LYMessages.c:368
+#: LYMessages.c:374
 msgid "Do you wish to send a comment?"
 msgstr ""
 
-#: LYMessages.c:369
+#: LYMessages.c:375
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr ""
 
-#: LYMessages.c:370
+#: LYMessages.c:376
 msgid "The 'e'dit command is currently disabled."
 msgstr ""
 
-#: LYMessages.c:371
+#: LYMessages.c:377
 msgid "System error - failure to get status."
 msgstr ""
 
-#: LYMessages.c:372
+#: LYMessages.c:378
 msgid "No editor is defined!"
 msgstr ""
 
-#: LYMessages.c:373
+#: LYMessages.c:379
 msgid "The 'p'rint command is currently disabled."
 msgstr ""
 
-#: LYMessages.c:374
+#: LYMessages.c:380
 msgid "Document has no Toolbar links or Banner."
 msgstr ""
 
-#: LYMessages.c:375
+#: LYMessages.c:381
 msgid "Unable to open traversal file."
 msgstr ""
 
-#: LYMessages.c:376
+#: LYMessages.c:382
 msgid "Unable to open traversal found file."
 msgstr ""
 
-#: LYMessages.c:377
+#: LYMessages.c:383
 msgid "Unable to open reject file."
 msgstr ""
 
-#: LYMessages.c:378
+#: LYMessages.c:384
 msgid "Unable to open traversal errors output file"
 msgstr ""
 
-#: LYMessages.c:379
+#: LYMessages.c:385
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr ""
 
-#: LYMessages.c:380
+#: LYMessages.c:386
 msgid "Follow link (or goto link or page) number: "
 msgstr ""
 
-#: LYMessages.c:381
+#: LYMessages.c:387
 msgid "Select option (or page) number: "
 msgstr ""
 
-#: LYMessages.c:382
+#: LYMessages.c:388
 msgid "Option choice (or page) number: "
 msgstr ""
 
-#: LYMessages.c:383
+#: LYMessages.c:389
 msgid "Option number %d already is current."
 msgstr ""
 
-#: LYMessages.c:384
+#: LYMessages.c:390
 msgid "Choice number %d already is current."
 msgstr ""
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:386
+#: LYMessages.c:392
 msgid "You are already at the end of this option list."
 msgstr ""
 
 #. #define ALREADY_AT_CHOICE_END
-#: LYMessages.c:388
+#: LYMessages.c:394
 msgid "You are already at the end of this choice list."
 msgstr ""
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:390
+#: LYMessages.c:396
 msgid "You are already at the beginning of this option list."
 msgstr ""
 
 #. #define ALREADY_AT_CHOICE_BEGIN
-#: LYMessages.c:392
+#: LYMessages.c:398
 msgid "You are already at the beginning of this choice list."
 msgstr ""
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:394
+#: LYMessages.c:400
 msgid "You are already at page %d of this option list."
 msgstr ""
 
 #. #define ALREADY_AT_CHOICE_PAGE
-#: LYMessages.c:396
+#: LYMessages.c:402
 msgid "You are already at page %d of this choice list."
 msgstr ""
 
-#: LYMessages.c:397
+#: LYMessages.c:403
 msgid "You have entered an invalid option number."
 msgstr ""
 
-#: LYMessages.c:398
+#: LYMessages.c:404
 msgid "You have entered an invalid choice number."
 msgstr ""
 
-#: LYMessages.c:399
+#: LYMessages.c:405
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr ""
 
-#: LYMessages.c:400
+#: LYMessages.c:406
 msgid "Give name of file to save in"
 msgstr ""
 
-#: LYMessages.c:401
+#: LYMessages.c:407
 msgid "Can't save data to file -- please run WWW locally"
 msgstr ""
 
-#: LYMessages.c:402
+#: LYMessages.c:408
 msgid "Can't open temporary file!"
 msgstr ""
 
-#: LYMessages.c:403
+#: LYMessages.c:409
 msgid "Can't open output file!  Cancelling!"
 msgstr ""
 
-#: LYMessages.c:404
+#: LYMessages.c:410
 msgid "Execution is disabled."
 msgstr ""
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:406
+#: LYMessages.c:412
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr ""
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:408
+#: LYMessages.c:414
 msgid "Execution capabilities are not compiled into this version."
 msgstr ""
 
-#: LYMessages.c:409
+#: LYMessages.c:415
 msgid "This file cannot be displayed on this terminal."
 msgstr ""
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:411
+#: LYMessages.c:417
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr ""
 
-#: LYMessages.c:412
+#: LYMessages.c:418
 msgid "%s  D)ownload, or C)ancel"
 msgstr ""
 
-#: LYMessages.c:413
+#: LYMessages.c:419
 msgid "Cancelling file."
 msgstr ""
 
-#: LYMessages.c:414
+#: LYMessages.c:420
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr ""
 
-#: LYMessages.c:415
+#: LYMessages.c:421
 msgid "Enter a filename: "
 msgstr ""
 
-#: LYMessages.c:416
+#: LYMessages.c:422
 msgid "Edit the previous filename: "
 msgstr ""
 
-#: LYMessages.c:417
+#: LYMessages.c:423
 msgid "Edit a previous filename: "
 msgstr ""
 
-#: LYMessages.c:418
+#: LYMessages.c:424
 msgid "Enter a new filename: "
 msgstr ""
 
-#: LYMessages.c:419
+#: LYMessages.c:425
 msgid "File name may not begin with a dot."
 msgstr ""
 
-#: LYMessages.c:421
+#: LYMessages.c:427
 msgid "File exists.  Create higher version?"
 msgstr ""
 
-#: LYMessages.c:423
+#: LYMessages.c:429
 msgid "File exists.  Overwrite?"
 msgstr ""
 
 #. VMS
-#: LYMessages.c:425
+#: LYMessages.c:431
 msgid "Cannot write to file."
 msgstr ""
 
-#: LYMessages.c:426
+#: LYMessages.c:432
 msgid "ERROR! - download command is misconfigured."
 msgstr ""
 
-#: LYMessages.c:427
+#: LYMessages.c:433
 msgid "Unable to download file."
 msgstr ""
 
-#: LYMessages.c:428
+#: LYMessages.c:434
 msgid "Building directory listing..."
 msgstr ""
 
-#: LYMessages.c:429
+#: LYMessages.c:435
 msgid "Saving..."
 msgstr ""
 
-#: LYMessages.c:430
+#: LYMessages.c:436
+msgid "Could not edit file '%s'."
+msgstr ""
+
+#: LYMessages.c:437
 msgid "Could not access file."
 msgstr ""
 
-#: LYMessages.c:431
+#: LYMessages.c:438
 msgid "Could not access directory."
 msgstr ""
 
-#: LYMessages.c:432
+#: LYMessages.c:439
 msgid "Could not load data."
 msgstr ""
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:434
+#: LYMessages.c:441
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr ""
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:436
+#: LYMessages.c:443
 msgid "This field cannot be (e)dited with an external editor."
 msgstr ""
 
-#: LYMessages.c:437
+#: LYMessages.c:444
 msgid "Bad rule"
 msgstr ""
 
-#: LYMessages.c:438
+#: LYMessages.c:445
 msgid "Insufficient operands:"
 msgstr ""
 
-#: LYMessages.c:439
+#: LYMessages.c:446
 msgid "You are not authorized to edit this file."
 msgstr ""
 
-#: LYMessages.c:440
+#: LYMessages.c:447
 msgid "Title: "
 msgstr ""
 
-#: LYMessages.c:441
+#: LYMessages.c:448
 msgid "Subject: "
 msgstr ""
 
-#: LYMessages.c:442
+#: LYMessages.c:449
 msgid "Username: "
 msgstr ""
 
-#: LYMessages.c:443
+#: LYMessages.c:450
 msgid "Password: "
 msgstr ""
 
-#: LYMessages.c:444
+#: LYMessages.c:451
 msgid "lynx: Username and Password required!!!"
 msgstr ""
 
-#: LYMessages.c:445
+#: LYMessages.c:452
 msgid "lynx: Password required!!!"
 msgstr ""
 
-#: LYMessages.c:446
+#: LYMessages.c:453
 msgid "Clear all authorization info for this session?"
 msgstr ""
 
-#: LYMessages.c:447
+#: LYMessages.c:454
 msgid "Authorization info cleared."
 msgstr ""
 
-#: LYMessages.c:448
+#: LYMessages.c:455
 msgid "Authorization failed.  Retry?"
 msgstr ""
 
-#: LYMessages.c:449
+#: LYMessages.c:456
 msgid "cgi support has been disabled by system administrator."
 msgstr ""
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:451
+#: LYMessages.c:458
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr ""
 
-#: LYMessages.c:452
+#: LYMessages.c:459
 msgid "Sorry, no known way of converting %s to %s."
 msgstr ""
 
-#: LYMessages.c:453
+#: LYMessages.c:460
 msgid "Unable to set up connection."
 msgstr ""
 
-#: LYMessages.c:454
+#: LYMessages.c:461
 msgid "Unable to make connection"
 msgstr ""
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:456
+#: LYMessages.c:463
 msgid "Executable link rejected due to malformed request."
 msgstr ""
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:458
+#: LYMessages.c:465
 msgid "Executable link rejected due to `%c' character."
 msgstr ""
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:460
+#: LYMessages.c:467
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr ""
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:462
+#: LYMessages.c:469
 msgid "Executable link rejected due to location or path."
 msgstr ""
 
-#: LYMessages.c:463
+#: LYMessages.c:470
 msgid "Mail access is disabled!"
 msgstr ""
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:465
+#: LYMessages.c:472
 msgid "Only files and servers on the local host can be accessed."
 msgstr ""
 
-#: LYMessages.c:466
+#: LYMessages.c:473
 msgid "Telnet access is disabled!"
 msgstr ""
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:468
+#: LYMessages.c:475
 msgid "Telnet port specifications are disabled."
 msgstr ""
 
-#: LYMessages.c:469
+#: LYMessages.c:476
 msgid "USENET news access is disabled!"
 msgstr ""
 
-#: LYMessages.c:470
+#: LYMessages.c:477
 msgid "Rlogin access is disabled!"
 msgstr ""
 
-#: LYMessages.c:471
+#: LYMessages.c:478
 msgid "Ftp access is disabled!"
 msgstr ""
 
-#: LYMessages.c:472
+#: LYMessages.c:479
 msgid "There are no references from this document."
 msgstr ""
 
-#: LYMessages.c:473
+#: LYMessages.c:480
 msgid "There are only hidden links from this document."
 msgstr ""
 
-#: LYMessages.c:475
+#: LYMessages.c:482
 msgid "Unable to open command file."
 msgstr ""
 
 #. VMS
-#: LYMessages.c:477
+#: LYMessages.c:484
 msgid "News Post Cancelled!!!"
 msgstr ""
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:479
+#: LYMessages.c:486
 msgid "Spawning your selected editor to edit news message"
 msgstr ""
 
-#: LYMessages.c:480
+#: LYMessages.c:487
 msgid "Post this message?"
 msgstr ""
 
-#: LYMessages.c:481
+#: LYMessages.c:488
 msgid "Append '%s'?"
 msgstr ""
 
-#: LYMessages.c:482
+#: LYMessages.c:489
 msgid "Posting to newsgroup(s)..."
 msgstr ""
 
-#: LYMessages.c:484
+#: LYMessages.c:491
 msgid "*** You have unread mail. ***"
 msgstr ""
 
-#: LYMessages.c:486
+#: LYMessages.c:493
 msgid "*** You have mail. ***"
 msgstr ""
 
 #. VMS
-#: LYMessages.c:488
+#: LYMessages.c:495
 msgid "*** You have new mail. ***"
 msgstr ""
 
-#: LYMessages.c:489
+#: LYMessages.c:496
 msgid "File insert cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:490
+#: LYMessages.c:497
 msgid "File does not exist."
 msgstr ""
 
-#: LYMessages.c:491
+#: LYMessages.c:498
 msgid "File does not exist - reenter or cancel:"
 msgstr ""
 
-#: LYMessages.c:492
+#: LYMessages.c:499
 msgid "File is not readable."
 msgstr ""
 
-#: LYMessages.c:493
+#: LYMessages.c:500
 msgid "File is not readable - reenter or cancel:"
 msgstr ""
 
-#: LYMessages.c:494
+#: LYMessages.c:501
 msgid "Nothing to insert - file is 0-length."
 msgstr ""
 
-#: LYMessages.c:495
+#: LYMessages.c:502
 msgid "Save request cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:496
+#: LYMessages.c:503
 msgid "Mail request cancelled!!!"
 msgstr ""
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:498
+#: LYMessages.c:505
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr ""
 
-#: LYMessages.c:499
+#: LYMessages.c:506
 msgid "Please wait..."
 msgstr ""
 
-#: LYMessages.c:500
+#: LYMessages.c:507
 msgid "Mailing file.  Please wait..."
 msgstr ""
 
-#: LYMessages.c:501
+#: LYMessages.c:508
 msgid "ERROR - Unable to mail file"
 msgstr ""
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:503
+#: LYMessages.c:510
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr ""
 
-#: LYMessages.c:504
+#: LYMessages.c:511
 msgid "Print request cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:505
+#: LYMessages.c:512
 msgid "Press <return> to begin: "
 msgstr ""
 
-#: LYMessages.c:506
+#: LYMessages.c:513
 msgid "Press <return> to finish: "
 msgstr ""
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:508
+#: LYMessages.c:515
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr ""
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:510
+#: LYMessages.c:517
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr ""
 
-#: LYMessages.c:511
+#: LYMessages.c:518
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr ""
 
-#: LYMessages.c:512
+#: LYMessages.c:519
 msgid "Unable to open tempfile"
 msgstr ""
 
-#: LYMessages.c:513
+#: LYMessages.c:520
 msgid "Unable to open print options file"
 msgstr ""
 
-#: LYMessages.c:514
+#: LYMessages.c:521
 msgid "Printing file.  Please wait..."
 msgstr ""
 
-#: LYMessages.c:515
+#: LYMessages.c:522
 msgid "Please enter a valid internet mail address: "
 msgstr ""
 
-#: LYMessages.c:516
+#: LYMessages.c:523
 msgid "ERROR! - printer is misconfigured!"
 msgstr ""
 
-#: LYMessages.c:517
+#: LYMessages.c:524
 msgid "Image map from POST response not available!"
 msgstr ""
 
-#: LYMessages.c:518
+#: LYMessages.c:525
 msgid "Misdirected client-side image MAP request!"
 msgstr ""
 
-#: LYMessages.c:519
+#: LYMessages.c:526
 msgid "Client-side image MAP is not accessible!"
 msgstr ""
 
-#: LYMessages.c:520
+#: LYMessages.c:527
 msgid "No client-side image MAPs are available!"
 msgstr ""
 
-#: LYMessages.c:521
+#: LYMessages.c:528
 msgid "Client-side image MAP is not available!"
 msgstr ""
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:524
+#: LYMessages.c:531
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr ""
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:526
+#: LYMessages.c:533
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr ""
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:528
+#: LYMessages.c:535
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr ""
 
 #. !NO_OPTION_MENU
-#: LYMessages.c:530
+#: LYMessages.c:537
 msgid "That key requires Advanced User mode."
 msgstr ""
 
-#: LYMessages.c:531
+#: LYMessages.c:538
 msgid "Content-type: %s"
 msgstr ""
 
-#: LYMessages.c:532
+#: LYMessages.c:539
 msgid "Command: "
 msgstr ""
 
-#: LYMessages.c:533
+#: LYMessages.c:540
 msgid " Version "
 msgstr ""
 
-#: LYMessages.c:534
+#: LYMessages.c:541
 msgid " first."
 msgstr ""
 
-#: LYMessages.c:535
+#: LYMessages.c:542
 msgid ", guessing..."
 msgstr ""
 
-#: LYMessages.c:536
+#: LYMessages.c:543
 msgid "Permissions for "
 msgstr ""
 
-#: LYMessages.c:537
+#: LYMessages.c:544
 msgid "Select "
 msgstr ""
 
-#: LYMessages.c:538
+#: LYMessages.c:545
 msgid "capital letter"
 msgstr ""
 
-#: LYMessages.c:539
+#: LYMessages.c:546
 msgid " of option line,"
 msgstr ""
 
-#: LYMessages.c:540
+#: LYMessages.c:547
 msgid " to save,"
 msgstr ""
 
-#: LYMessages.c:541
+#: LYMessages.c:548
 msgid " to "
 msgstr ""
 
-#: LYMessages.c:542
+#: LYMessages.c:549
 msgid " or "
 msgstr ""
 
-#: LYMessages.c:543
+#: LYMessages.c:550
 msgid " index"
 msgstr ""
 
-#: LYMessages.c:544
+#: LYMessages.c:551
 msgid " to return to Lynx."
 msgstr ""
 
-#: LYMessages.c:545
+#: LYMessages.c:552
 msgid "Accept Changes"
 msgstr ""
 
-#: LYMessages.c:546
+#: LYMessages.c:553
 msgid "Reset Changes"
 msgstr ""
 
-#: LYMessages.c:547
+#: LYMessages.c:554
 msgid "Left Arrow cancels changes"
 msgstr ""
 
-#: LYMessages.c:548
+#: LYMessages.c:555
 msgid "Save options to disk"
 msgstr ""
 
-#: LYMessages.c:549
+#: LYMessages.c:556
 msgid "Hit RETURN to accept entered data."
 msgstr ""
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:551
+#: LYMessages.c:558
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr ""
 
-#: LYMessages.c:552
+#: LYMessages.c:559
 msgid "Value accepted!"
 msgstr ""
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:554
+#: LYMessages.c:561
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr ""
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:556
+#: LYMessages.c:563
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr ""
 
-#: LYMessages.c:557
+#: LYMessages.c:564
 msgid "You are not allowed to change which editor to use!"
 msgstr ""
 
-#: LYMessages.c:558
+#: LYMessages.c:565
 msgid "Failed to set DISPLAY variable!"
 msgstr ""
 
-#: LYMessages.c:559
+#: LYMessages.c:566
 msgid "Failed to clear DISPLAY variable!"
 msgstr ""
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:561
+#: LYMessages.c:568
 msgid "You are not allowed to change the bookmark file!"
 msgstr ""
 
-#: LYMessages.c:562
+#: LYMessages.c:569
 msgid "Terminal does not support color"
 msgstr ""
 
-#: LYMessages.c:563
+#: LYMessages.c:570
 msgid "Your '%s' terminal does not support color."
 msgstr ""
 
-#: LYMessages.c:564
+#: LYMessages.c:571
 msgid "Access to dot files is disabled!"
 msgstr ""
 
 #. #define UA_COPYRIGHT_WARNING
-#: LYMessages.c:566
+#: LYMessages.c:573
 msgid "WARNING: Misrepresentation of the User-Agent may be a copyright violation!"
 msgstr ""
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:568
+#: LYMessages.c:575
 msgid "You are not allowed to change this setting."
 msgstr ""
 
-#: LYMessages.c:569
+#: LYMessages.c:576
 msgid "Saving Options..."
 msgstr ""
 
-#: LYMessages.c:570
+#: LYMessages.c:577
 msgid "Options saved!"
 msgstr ""
 
-#: LYMessages.c:571
+#: LYMessages.c:578
 msgid "Unable to save Options!"
 msgstr ""
 
-#: LYMessages.c:572
+#: LYMessages.c:579
 msgid " 'r' to return to Lynx "
 msgstr ""
 
-#: LYMessages.c:573
+#: LYMessages.c:580
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr ""
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:575
+#: LYMessages.c:582
 msgid "Hit any key to change value; RETURN to accept."
 msgstr ""
 
-#: LYMessages.c:576
+#: LYMessages.c:583
 msgid "Error uncompressing temporary file!"
 msgstr ""
 
-#: LYMessages.c:577
+#: LYMessages.c:584
 msgid "Unsupported URL scheme!"
 msgstr ""
 
-#: LYMessages.c:578
+#: LYMessages.c:585
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr ""
 
-#: LYMessages.c:579
+#: LYMessages.c:586
 msgid "Redirection limit of 10 URL's reached."
 msgstr ""
 
-#: LYMessages.c:580
+#: LYMessages.c:587
 msgid "Illegal redirection URL received from server!"
 msgstr ""
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:582
+#: LYMessages.c:589
 msgid "Server asked for %d redirection of POST content to"
 msgstr ""
 
-#: LYMessages.c:583
+#: LYMessages.c:590
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr ""
 
-#: LYMessages.c:584
+#: LYMessages.c:591
 msgid "P)roceed, or C)ancel "
 msgstr ""
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:586
+#: LYMessages.c:593
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr ""
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:588
+#: LYMessages.c:595
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr ""
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:590
+#: LYMessages.c:597
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr ""
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:592
+#: LYMessages.c:599
 msgid "Resubmit POST content to %s ?"
 msgstr ""
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:594
+#: LYMessages.c:601
 msgid "List from document with POST data.  Reload %s ?"
 msgstr ""
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:596
+#: LYMessages.c:603
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr ""
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:598
+#: LYMessages.c:605
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr ""
 
-#: LYMessages.c:599
+#: LYMessages.c:606
 msgid "Proceed without a username and password?"
 msgstr ""
 
-#: LYMessages.c:600
+#: LYMessages.c:607
 msgid "Proceed (%s)?"
 msgstr ""
 
-#: LYMessages.c:601
+#: LYMessages.c:608
 msgid "Cannot POST to this host."
 msgstr ""
 
-#: LYMessages.c:602
+#: LYMessages.c:609
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr ""
 
-#: LYMessages.c:603
+#: LYMessages.c:610
 msgid "Discarding POST data..."
 msgstr ""
 
-#: LYMessages.c:604
+#: LYMessages.c:611
 msgid "Document will not be reloaded!"
 msgstr ""
 
-#: LYMessages.c:605
+#: LYMessages.c:612
 msgid "Location: "
 msgstr ""
 
-#: LYMessages.c:606
+#: LYMessages.c:613
 msgid "'%s' not found!"
 msgstr ""
 
-#: LYMessages.c:607
+#: LYMessages.c:614
 msgid "Default Bookmark File"
 msgstr ""
 
-#: LYMessages.c:608
+#: LYMessages.c:615
 msgid "Screen too small! (8x35 min)"
 msgstr ""
 
-#: LYMessages.c:609
+#: LYMessages.c:616
 msgid "Select destination or ^G to Cancel: "
 msgstr ""
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:611
+#: LYMessages.c:618
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr ""
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:613
+#: LYMessages.c:620
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr ""
 
-#: LYMessages.c:614
+#: LYMessages.c:621
 msgid "Multiple bookmark support is not available."
 msgstr ""
 
-#: LYMessages.c:615
+#: LYMessages.c:622
 msgid " Select Bookmark (screen %d of %d)"
 msgstr ""
 
-#: LYMessages.c:616
+#: LYMessages.c:623
 msgid "       Select Bookmark"
 msgstr ""
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:618
+#: LYMessages.c:625
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr ""
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:620
+#: LYMessages.c:627
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr ""
 
-#: LYMessages.c:621
+#: LYMessages.c:628
 msgid "Letter: "
 msgstr ""
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:624
+#: LYMessages.c:631
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr ""
 
-#: LYMessages.c:626
+#: LYMessages.c:633
 msgid "Use a filepath off your home directory!"
 msgstr ""
 
 #. VMS
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:629
+#: LYMessages.c:636
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr ""
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:631
+#: LYMessages.c:638
 msgid "History List maximum reached!  Document not pushed."
 msgstr ""
 
-#: LYMessages.c:632
+#: LYMessages.c:639
 msgid "No previously visited links available!"
 msgstr ""
 
-#: LYMessages.c:633
+#: LYMessages.c:640
 msgid "Memory exhausted!  Program aborted!"
 msgstr ""
 
-#: LYMessages.c:634
+#: LYMessages.c:641
 msgid "Memory exhausted!  Aborting..."
 msgstr ""
 
-#: LYMessages.c:635
+#: LYMessages.c:642
 msgid "Directory/File Manager not available"
 msgstr ""
 
-#: LYMessages.c:636
+#: LYMessages.c:643
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr ""
 
-#: LYMessages.c:637
+#: LYMessages.c:644
 msgid "Location URL is not absolute."
 msgstr ""
 
-#: LYMessages.c:638
+#: LYMessages.c:645
 msgid "Refresh URL is not absolute."
 msgstr ""
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:640
+#: LYMessages.c:647
 msgid ""
 "You are sending a message with body to:\n"
 "  "
 msgstr ""
 
-#: LYMessages.c:641
+#: LYMessages.c:648
 msgid ""
 "You are sending a comment to:\n"
 "  "
 msgstr ""
 
-#: LYMessages.c:642
+#: LYMessages.c:649
 msgid ""
 "\n"
 " With copy to:\n"
 "  "
 msgstr ""
 
-#: LYMessages.c:643
+#: LYMessages.c:650
 msgid ""
 "\n"
 " With copies to:\n"
@@ -1961,7 +1965,7 @@ msgid ""
 msgstr ""
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:645
+#: LYMessages.c:652
 msgid ""
 "\n"
 "\n"
@@ -1969,560 +1973,561 @@ msgid ""
 msgstr ""
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:647
+#: LYMessages.c:654
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
 msgstr ""
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:649
+#: LYMessages.c:656
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
 msgstr ""
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:651
+#: LYMessages.c:658
 msgid " means to contact you, if you desire a response.\n"
 msgstr ""
 
-#: LYMessages.c:652
+#: LYMessages.c:659
 msgid ""
 "\n"
 " Please enter a subject line.\n"
 msgstr ""
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:654
+#: LYMessages.c:661
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
 msgstr ""
 
-#: LYMessages.c:655
+#: LYMessages.c:662
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr ""
 
-#: LYMessages.c:656
+#: LYMessages.c:663
 msgid ""
 "\n"
 " Please review the message body:\n"
 "\n"
 msgstr ""
 
-#: LYMessages.c:657
+#: LYMessages.c:664
 msgid ""
 "\n"
 "Press RETURN to continue: "
 msgstr ""
 
-#: LYMessages.c:658
+#: LYMessages.c:665
 msgid ""
 "\n"
 "Press RETURN to clean up: "
 msgstr ""
 
-#: LYMessages.c:659
+#: LYMessages.c:666
 msgid " Use Control-U to erase the default.\n"
 msgstr ""
 
-#: LYMessages.c:660
+#: LYMessages.c:667
 msgid ""
 "\n"
 " Please enter your message below."
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:662 src/LYNews.c:331
+#: LYMessages.c:669 src/LYNews.c:331
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:664 src/LYNews.c:332
+#: LYMessages.c:671 src/LYNews.c:332
 msgid ""
 "\n"
 " on a line and press enter again."
 msgstr ""
 
-#. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:668
+#: LYMessages.c:675
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr ""
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:670
+#: LYMessages.c:677
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr ""
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:672
+#: LYMessages.c:679
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr ""
 
-#: LYMessages.c:673
+#: LYMessages.c:680
 msgid "Allowing this cookie."
 msgstr ""
 
-#: LYMessages.c:674
+#: LYMessages.c:681
 msgid "Rejecting this cookie."
 msgstr ""
 
-#: LYMessages.c:675
+#: LYMessages.c:682
 msgid "The Cookie Jar is empty."
 msgstr ""
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:677
+#: LYMessages.c:684
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr ""
 
-#: LYMessages.c:678
+#: LYMessages.c:685
 msgid "or to change a domain's 'allow' setting."
 msgstr ""
 
-#: LYMessages.c:679
+#: LYMessages.c:686
 msgid "(Cookies never allowed.)"
 msgstr ""
 
-#: LYMessages.c:680
+#: LYMessages.c:687
 msgid "(Cookies always allowed.)"
 msgstr ""
 
-#: LYMessages.c:681
+#: LYMessages.c:688
 msgid "(Cookies allowed via prompt.)"
 msgstr ""
 
-#: LYMessages.c:682
+#: LYMessages.c:689
 msgid "(Persistent Cookies.)"
 msgstr ""
 
-#: LYMessages.c:683
+#: LYMessages.c:690
 msgid "(No title.)"
 msgstr ""
 
-#: LYMessages.c:684
+#: LYMessages.c:691
 msgid "(No name.)"
 msgstr ""
 
-#: LYMessages.c:685
+#: LYMessages.c:692
 msgid "(No value.)"
 msgstr ""
 
-#: LYMessages.c:686
+#: LYMessages.c:693
 msgid "None"
 msgstr ""
 
-#: LYMessages.c:687
+#: LYMessages.c:694
 msgid "(End of session.)"
 msgstr ""
 
-#: LYMessages.c:688
+#: LYMessages.c:695
 msgid "Delete this cookie?"
 msgstr ""
 
-#: LYMessages.c:689
+#: LYMessages.c:696
 msgid "The cookie has been eaten!"
 msgstr ""
 
-#: LYMessages.c:690
+#: LYMessages.c:697
 msgid "Delete this empty domain?"
 msgstr ""
 
-#: LYMessages.c:691
+#: LYMessages.c:698
 msgid "The domain has been eaten!"
 msgstr ""
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:693
+#: LYMessages.c:700
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr ""
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:695
+#: LYMessages.c:702
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr ""
 
-#: LYMessages.c:696
+#: LYMessages.c:703
 msgid "All cookies in the domain have been eaten!"
 msgstr ""
 
-#: LYMessages.c:697
+#: LYMessages.c:704
 msgid "'A'lways allowing from domain '%s'."
 msgstr ""
 
-#: LYMessages.c:698
+#: LYMessages.c:705
 msgid "ne'V'er allowing from domain '%s'."
 msgstr ""
 
-#: LYMessages.c:699
+#: LYMessages.c:706
 msgid "'P'rompting to allow from domain '%s'."
 msgstr ""
 
-#: LYMessages.c:700
+#: LYMessages.c:707
 msgid "Delete all cookies in this domain?"
 msgstr ""
 
-#: LYMessages.c:701
+#: LYMessages.c:708
 msgid "All of the cookies in the jar have been eaten!"
 msgstr ""
 
-#: LYMessages.c:703
+#: LYMessages.c:710
 msgid "Port 19 not permitted in URLs."
 msgstr ""
 
-#: LYMessages.c:704
+#: LYMessages.c:711
 msgid "Port 25 not permitted in URLs."
 msgstr ""
 
-#: LYMessages.c:705
+#: LYMessages.c:712
 msgid "Port %lu not permitted in URLs."
 msgstr ""
 
-#: LYMessages.c:706
+#: LYMessages.c:713
 msgid "URL has a bad port field."
 msgstr ""
 
-#: LYMessages.c:707
+#: LYMessages.c:714
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr ""
 
-#: LYMessages.c:708
+#: LYMessages.c:715
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr ""
 
-#: LYMessages.c:709
+#: LYMessages.c:716
 msgid "Trace Log open failed.  Trace off!."
 msgstr ""
 
-#: LYMessages.c:710
+#: LYMessages.c:717
 msgid "Lynx Trace Log"
 msgstr ""
 
-#: LYMessages.c:711
+#: LYMessages.c:718
 msgid "No trace log has been started for this session."
 msgstr ""
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:713
+#: LYMessages.c:720
 msgid "The maximum temporary file count has been reached!"
 msgstr ""
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:715
+#: LYMessages.c:722
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr ""
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:717
+#: LYMessages.c:724
 msgid "Modified tail combined with head of form field value."
 msgstr ""
 
 #. HTFile.c
-#: LYMessages.c:720
+#: LYMessages.c:727
 msgid "Directory"
 msgstr ""
 
-#: LYMessages.c:721
+#: LYMessages.c:728
 msgid "Directory browsing is not allowed."
 msgstr ""
 
-#: LYMessages.c:722
+#: LYMessages.c:729
 msgid "Selective access is not enabled for this directory"
 msgstr ""
 
-#: LYMessages.c:723
+#: LYMessages.c:730
 msgid "Multiformat: directory scan failed."
 msgstr ""
 
-#: LYMessages.c:724
+#: LYMessages.c:731
 msgid "This directory is not readable."
 msgstr ""
 
-#: LYMessages.c:725
+#: LYMessages.c:732
 msgid "Can't access requested file."
 msgstr ""
 
-#: LYMessages.c:726
+#: LYMessages.c:733
 msgid "Could not find suitable representation for transmission."
 msgstr ""
 
-#: LYMessages.c:727
+#: LYMessages.c:734
 msgid "Could not open file for decompression!"
 msgstr ""
 
-#: LYMessages.c:728
+#: LYMessages.c:735
 msgid "Files:"
 msgstr ""
 
-#: LYMessages.c:729
+#: LYMessages.c:736
 msgid "Subdirectories:"
 msgstr ""
 
-#: LYMessages.c:730
+#: LYMessages.c:737
 msgid " directory"
 msgstr ""
 
-#: LYMessages.c:731
+#: LYMessages.c:738
 msgid "Up to "
 msgstr ""
 
-#: LYMessages.c:732
+#: LYMessages.c:739
 msgid "Current directory is "
 msgstr ""
 
 #. HTGopher.c
-#: LYMessages.c:735
+#: LYMessages.c:742
 msgid "No response from server!"
 msgstr ""
 
-#: LYMessages.c:736
+#: LYMessages.c:743
 msgid "CSO index"
 msgstr ""
 
-#: LYMessages.c:737
+#: LYMessages.c:744
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
 msgstr ""
 
-#: LYMessages.c:738
+#: LYMessages.c:745
 msgid "CSO Search Results"
 msgstr ""
 
-#: LYMessages.c:739
+#: LYMessages.c:746
 msgid "Seek fail on %s\n"
 msgstr ""
 
-#: LYMessages.c:740
+#: LYMessages.c:747
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
 msgstr ""
 
-#: LYMessages.c:741
+#: LYMessages.c:748
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
 msgstr ""
 
-#: LYMessages.c:742
+#: LYMessages.c:749
 msgid "Gopher index"
 msgstr ""
 
-#: LYMessages.c:743
+#: LYMessages.c:750
 msgid "Gopher Menu"
 msgstr ""
 
-#: LYMessages.c:744
+#: LYMessages.c:751
 msgid " Search Results"
 msgstr ""
 
-#: LYMessages.c:745
+#: LYMessages.c:752
 msgid "Sending CSO/PH request."
 msgstr ""
 
-#: LYMessages.c:746
+#: LYMessages.c:753
 msgid "Sending Gopher request."
 msgstr ""
 
-#: LYMessages.c:747
+#: LYMessages.c:754
 msgid "CSO/PH request sent; waiting for response."
 msgstr ""
 
-#: LYMessages.c:748
+#: LYMessages.c:755
 msgid "Gopher request sent; waiting for response."
 msgstr ""
 
-#: LYMessages.c:749
+#: LYMessages.c:756
 msgid ""
 "\n"
 "Please enter search keywords.\n"
 msgstr ""
 
-#: LYMessages.c:750
+#: LYMessages.c:757
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
 msgstr ""
 
-#: LYMessages.c:751
+#: LYMessages.c:758
 msgid " person's name in the database.\n"
 msgstr ""
 
-#. HTNews.c
-#: LYMessages.c:754
+#: LYMessages.c:761
 msgid "Connection closed ???"
 msgstr ""
 
-#: LYMessages.c:755
+#: LYMessages.c:762
 msgid "Cannot open temporary file for news POST."
 msgstr ""
 
-#: LYMessages.c:756
+#: LYMessages.c:763
 msgid "This client does not contain support for posting to news with SSL."
 msgstr ""
 
 #. HTStyle.c
-#: LYMessages.c:759
+#: LYMessages.c:766
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr ""
 
-#: LYMessages.c:760
+#: LYMessages.c:767
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr ""
 
-#: LYMessages.c:761
+#: LYMessages.c:768
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr ""
 
-#: LYMessages.c:762
+#: LYMessages.c:769
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr ""
 
-#: LYMessages.c:765
+#. HTTP.c
+#: LYMessages.c:772
 msgid "Can't proceed without a username and password."
 msgstr ""
 
-#: LYMessages.c:766
+#: LYMessages.c:773
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr ""
 
-#: LYMessages.c:767
+#: LYMessages.c:774
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr ""
 
-#: LYMessages.c:768
+#: LYMessages.c:775
 msgid "Retrying with proxy authorization information."
 msgstr ""
 
-#: LYMessages.c:771
+#. HTWAIS.c
+#: LYMessages.c:778
 msgid "HTWAIS: Return message too large."
 msgstr ""
 
-#: LYMessages.c:772
+#: LYMessages.c:779
 msgid "Enter WAIS query: "
 msgstr ""
 
 #. Miscellaneous status
-#: LYMessages.c:775
+#: LYMessages.c:782
 msgid "Retrying as HTTP0 request."
 msgstr ""
 
-#: LYMessages.c:776
+#: LYMessages.c:783
 msgid "Transferred %d bytes"
 msgstr ""
 
-#: LYMessages.c:777
+#: LYMessages.c:784
 msgid "Data transfer complete"
 msgstr ""
 
-#: LYMessages.c:778
+#: LYMessages.c:785
 msgid "Error processing line %d of %s\n"
 msgstr ""
 
 #. Lynx internal page titles
-#: LYMessages.c:781
+#: LYMessages.c:788
 msgid "Address List Page"
 msgstr ""
 
-#: LYMessages.c:782
+#: LYMessages.c:789
 msgid "Bookmark file"
 msgstr ""
 
-#: LYMessages.c:783
+#: LYMessages.c:790
 msgid "Configuration Definitions"
 msgstr ""
 
-#: LYMessages.c:784
+#: LYMessages.c:791
 msgid "Cookie Jar"
 msgstr ""
 
-#: LYMessages.c:785
+#: LYMessages.c:792
 msgid "Current Key Map"
 msgstr ""
 
-#: LYMessages.c:786
+#: LYMessages.c:793
 msgid "File Management Options"
 msgstr ""
 
-#: LYMessages.c:787
+#: LYMessages.c:794
 msgid "Download Options"
 msgstr ""
 
-#: LYMessages.c:788
+#: LYMessages.c:795
 msgid "History Page"
 msgstr ""
 
-#: LYMessages.c:789
+#: LYMessages.c:796
 msgid "List Page"
 msgstr ""
 
-#: LYMessages.c:790
+#: LYMessages.c:797
 msgid "Lynx.cfg Information"
 msgstr ""
 
-#: LYMessages.c:791
+#: LYMessages.c:798
 msgid "Converted Mosaic Hotlist"
 msgstr ""
 
-#: LYMessages.c:792
+#: LYMessages.c:799
 msgid "Options Menu"
 msgstr ""
 
-#: LYMessages.c:793
+#: LYMessages.c:800
 msgid "File Permission Options"
 msgstr ""
 
-#: LYMessages.c:794
+#: LYMessages.c:801
 msgid "Printing Options"
 msgstr ""
 
-#: LYMessages.c:795
+#: LYMessages.c:802
 msgid "Information about the current document"
 msgstr ""
 
-#: LYMessages.c:796
+#: LYMessages.c:803
 msgid "Your recent statusline messages"
 msgstr ""
 
-#: LYMessages.c:797
+#: LYMessages.c:804
 msgid "Upload Options"
 msgstr ""
 
-#: LYMessages.c:798
+#: LYMessages.c:805
 msgid "Visited Links Page"
 msgstr ""
 
-#: LYMessages.c:801
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:808
 msgid "See also"
 msgstr ""
 
-#: LYMessages.c:802
+#: LYMessages.c:809
 msgid "your"
 msgstr ""
 
-#: LYMessages.c:803
+#: LYMessages.c:810
 msgid "for runtime options"
 msgstr ""
 
-#: LYMessages.c:804
+#: LYMessages.c:811
 msgid "compile time options"
 msgstr ""
 
-#: LYMessages.c:805
+#: LYMessages.c:812
 msgid "latest release"
 msgstr ""
 
-#: LYMessages.c:806
+#: LYMessages.c:813
 msgid "development version"
 msgstr ""
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:808
+#: LYMessages.c:815
 msgid ""
 "The following data were derived during the automatic configuration/build\n"
 "process of this copy of Lynx.  When reporting a bug, please include a copy\n"
@@ -2530,28 +2535,27 @@ msgid ""
 msgstr ""
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:812
+#: LYMessages.c:819
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
 msgstr ""
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:817
+#: LYMessages.c:824
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr ""
 
-#: LYMessages.c:818
+#: LYMessages.c:825
 msgid "Failed to obtain status of current link!"
 msgstr ""
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:821
+#: LYMessages.c:828
 msgid "Special URL only valid from current File Permission menu!"
 msgstr ""
 
-#. DIRED_SUPPORT
-#: LYMessages.c:825
+#: LYMessages.c:832
 msgid "External support is currently disabled."
 msgstr ""
 
@@ -2603,11 +2607,7 @@ msgstr ""
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr ""
 
-#.
-#. * hack: if we fail in HTAccess.c
-#. * avoid duplicating URL, oh.
-#.
-#: WWW/Library/Implementation/HTAccess.c:1014 src/LYMainLoop.c:6235
+#: WWW/Library/Implementation/HTAccess.c:1014 src/LYMainLoop.c:6233
 msgid "Can't Access"
 msgstr ""
 
@@ -2786,52 +2786,45 @@ msgstr ""
 msgid "Reading news article."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1199
+#: WWW/Library/Implementation/HTTCP.c:1201
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1352
+#: WWW/Library/Implementation/HTTCP.c:1354
 msgid "Looking up %s."
 msgstr ""
 
-#. Not HTProgress, so warning won't be overwritten
-#. *  immediately; but not HTAlert, because typically
-#. *  there will be other alerts from the callers. - kw
-#.
-#: WWW/Library/Implementation/HTTCP.c:1362 WWW/Library/Implementation/HTTelnet.c:99
+#: WWW/Library/Implementation/HTTCP.c:1364 WWW/Library/Implementation/HTTelnet.c:99
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1365
+#: WWW/Library/Implementation/HTTCP.c:1367
 msgid "Unable to locate remote host %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1375
+#: WWW/Library/Implementation/HTTCP.c:1377
 msgid "Making %s connection to %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1385
+#: WWW/Library/Implementation/HTTCP.c:1387
 msgid "socket failed."
 msgstr ""
 
 #. USE_FCNTL
-#: WWW/Library/Implementation/HTTCP.c:1404
+#: WWW/Library/Implementation/HTTCP.c:1406
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#.
-#. **	Protect against an infinite loop.
-#.
-#: WWW/Library/Implementation/HTTCP.c:1458
+#: WWW/Library/Implementation/HTTCP.c:1460
 msgid "Connection failed for 180,000 tries."
 msgstr ""
 
 #. USE_FCNTL
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1594
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1646
+#: WWW/Library/Implementation/HTTCP.c:1648
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
@@ -3167,7 +3160,7 @@ msgstr ""
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:8796
+#: src/GridText.c:8810
 msgid "Submitting %s"
 msgstr ""
 
@@ -3195,11 +3188,11 @@ msgstr ""
 msgid " (Press 'z' to abort)"
 msgstr ""
 
-#: src/HTAlert.c:210
+#: src/HTAlert.c:208
 msgid "yes"
 msgstr ""
 
-#: src/HTAlert.c:211
+#: src/HTAlert.c:209
 msgid "no"
 msgstr ""
 
@@ -3260,19 +3253,19 @@ msgstr ""
 msgid "Unable to access cgi script"
 msgstr ""
 
-#: src/LYCgi.c:649 src/LYCgi.c:652
+#: src/LYCgi.c:650 src/LYCgi.c:653
 msgid "Good Advice"
 msgstr ""
 
-#: src/LYCgi.c:655
+#: src/LYCgi.c:656
 msgid "An excellent http server for VMS is available via"
 msgstr ""
 
-#: src/LYCgi.c:662
+#: src/LYCgi.c:663
 msgid "this link"
 msgstr ""
 
-#: src/LYCgi.c:666
+#: src/LYCgi.c:667
 msgid "It provides state of the art CGI script support.\n"
 msgstr ""
 
@@ -3295,37 +3288,37 @@ msgstr ""
 msgid "Maximum Gobble Date:"
 msgstr ""
 
-#: src/LYCurses.c:784
+#: src/LYCurses.c:787
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1025
+#: src/LYCurses.c:1030
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1030
+#: src/LYCurses.c:1035
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr ""
 
-#: src/LYCurses.c:1108
+#: src/LYCurses.c:1113
 msgid "Your Terminal type is unknown!"
 msgstr ""
 
-#: src/LYCurses.c:1109
+#: src/LYCurses.c:1114
 msgid "Enter a terminal type:"
 msgstr ""
 
-#: src/LYCurses.c:1122
+#: src/LYCurses.c:1127
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:1365
+#: src/LYCurses.c:1370
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 
-#: src/LYCurses.c:1367
+#: src/LYCurses.c:1372
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3824,7 +3817,7 @@ msgstr ""
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:305 src/LYMainLoop.c:3799
+#: src/LYMainLoop.c:305 src/LYMainLoop.c:3797
 msgid "Entry into main screen"
 msgstr ""
 
@@ -3832,42 +3825,45 @@ msgstr ""
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:1383 src/LYMainLoop.c:1387
+#: src/LYMainLoop.c:1379 src/LYMainLoop.c:1383
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:3012
+#: src/LYMainLoop.c:3010
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr ""
 
 #.
 #. *	Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:3730
+#: src/LYMainLoop.c:3728
 msgid "A URL specified by the user"
 msgstr ""
 
-#: src/LYMainLoop.c:3756
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3754
 msgid "Help Screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3780
+#: src/LYMainLoop.c:3778
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:5449
+#: src/LYMainLoop.c:5447
 msgid "charset for this document specified explicitely, sorry..."
 msgstr ""
 
-#: src/LYMainLoop.c:6230
+#: src/LYMainLoop.c:6228
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:6242
+#: src/LYMainLoop.c:6240
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:6243
+#: src/LYMainLoop.c:6241
 msgid "      Exiting..."
 msgstr ""
 
@@ -3920,79 +3916,82 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:655
+#: src/LYOptions.c:659
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:657
+#: src/LYOptions.c:661
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:4139
+#.
+#. * preformatted text follows
+#.
+#: src/LYOptions.c:4143
 msgid "Personal Preferences"
 msgstr ""
 
 #. Cookies: SELECT
-#: src/LYOptions.c:4142
+#: src/LYOptions.c:4146
 msgid "Cookies"
 msgstr ""
 
-#: src/LYOptions.c:4156
+#. Editor: INPUT
+#: src/LYOptions.c:4160
 msgid "Editor"
 msgstr ""
 
-#. Emacs keys: ON/OFF
-#: src/LYOptions.c:4161
+#: src/LYOptions.c:4165
 msgid "Emacs keys"
 msgstr ""
 
-#. Keypad Mode: SELECT
-#: src/LYOptions.c:4167
+#: src/LYOptions.c:4171
 msgid "Keypad mode"
 msgstr ""
 
-#: src/LYOptions.c:4197
+#. Mail Address: INPUT
+#: src/LYOptions.c:4201
 msgid "Personal mail address"
 msgstr ""
 
-#. Search Type: SELECT
-#: src/LYOptions.c:4202
+#: src/LYOptions.c:4206
 msgid "Searching type"
 msgstr ""
 
-#: src/LYOptions.c:4213
+#: src/LYOptions.c:4217
 msgid "Show color"
 msgstr ""
 
-#: src/LYOptions.c:4252
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:4256
 msgid "Show cursor"
 msgstr ""
 
-#: src/LYOptions.c:4258
+#. User Mode: SELECT
+#: src/LYOptions.c:4262
 msgid "User mode"
 msgstr ""
 
-#: src/LYOptions.c:4264
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:4268
 msgid "VI keys"
 msgstr ""
 
-#: src/LYOptions.c:4270
+#. Display Character Set: SELECT
+#: src/LYOptions.c:4274
 msgid "Display character set"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:4283
+#: src/LYOptions.c:4287
 msgid "X Display"
 msgstr ""
 
-#.
-#. * Document Layout
-#.
-#: src/LYOptions.c:4289
+#: src/LYOptions.c:4293
 msgid "Document Layout"
 msgstr ""
 
-#: src/LYOptions.c:4306
+#: src/LYOptions.c:4310
 msgid "Assumed document character set"
 msgstr ""
 
@@ -4001,89 +4000,94 @@ msgstr ""
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:4323
+#: src/LYOptions.c:4327
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:4325
+#: src/LYOptions.c:4329
 msgid "Raw 8-bit"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:4332
+#: src/LYOptions.c:4336
 msgid "HTML error recovery"
 msgstr ""
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:4338
+#: src/LYOptions.c:4342
 msgid "Popups for select fields"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:4344
+#: src/LYOptions.c:4348
 msgid "Show images"
 msgstr ""
 
-#: src/LYOptions.c:4358
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:4362
 msgid "Verbose images"
 msgstr ""
 
-#: src/LYOptions.c:4366
+#.
+#. * Bookmark Options
+#.
+#: src/LYOptions.c:4370
 msgid "Bookmark Options"
 msgstr ""
 
-#: src/LYOptions.c:4370
+#. Multi-Bookmark Mode: SELECT
+#: src/LYOptions.c:4374
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:4387
+#: src/LYOptions.c:4391
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:4389
+#: src/LYOptions.c:4393
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:4392
+#: src/LYOptions.c:4396
 msgid "Bookmarks file"
 msgstr ""
 
-#. FTP sort: SELECT
-#: src/LYOptions.c:4403
+#: src/LYOptions.c:4407
 msgid "FTP sort criteria"
 msgstr ""
 
-#. Local Directory Sort: SELECT
-#: src/LYOptions.c:4410
+#: src/LYOptions.c:4414
 msgid "Local directory sort criteria"
 msgstr ""
 
-#: src/LYOptions.c:4418
+#: src/LYOptions.c:4422
 msgid "Show dot files"
 msgstr ""
 
 #. Execution links: SELECT
-#: src/LYOptions.c:4426
+#: src/LYOptions.c:4430
 msgid "Execution links"
 msgstr ""
 
+#. ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS
 #.
 #. * Headers transferred to remote server
 #.
-#: src/LYOptions.c:4447
+#: src/LYOptions.c:4451
 msgid "Headers transferred to remote server"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4450
+#: src/LYOptions.c:4454
 msgid "Preferred document character set"
 msgstr ""
 
-#: src/LYOptions.c:4455
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:4459
 msgid "Preferred document language"
 msgstr ""
 
-#: src/LYOptions.c:4461
+#: src/LYOptions.c:4465
 msgid "User-Agent header"
 msgstr ""
 
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 9792e533..288385da 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -464,7 +464,7 @@ PRIVATE void store_cookie ARGS3(
 	de->invcheck_bv = INVCHECK_QUERY; /* should this go here? */
 	cookie_list = de->cookie_list = HTList_new();
 	StrAllocCopy(de->domain, co->domain);
-	HTList_addObject(domain_list, de);
+	HTList_appendObject(domain_list, de);
     }
 
     /*
@@ -2740,7 +2740,7 @@ PUBLIC void cookie_domain_flag_set ARGS2(
 
 	    StrAllocCopy(de->domain, strsmall);
 	    de->cookie_list = HTList_new();
-	    HTList_addObject(domain_list, de);
+	    HTList_appendObject(domain_list, de);
 	} else {
 	    switch(flag) {
 		case (FLAG_ACCEPT_ALWAYS): de2->bv = ACCEPT_ALWAYS;
diff --git a/src/LYOptions.c b/src/LYOptions.c
index cc635c5d..6d52e11f 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -128,6 +128,10 @@ PRIVATE int add_it ARGS2(char *, text, int, len)
     return 0;
 }
 
+/*
+ * addlbl() is used instead of plain addstr() in old-style options menu
+ * to show hot keys in bold.
+ */
 PRIVATE void addlbl ARGS1(CONST char *, text)
 {
     char actual[80];
@@ -420,7 +424,7 @@ draw_options:
 
 #ifdef ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS
     move(L_Exec, 5);
-    addstr("local e(X)ecution links      : ");
+    addlbl("local e(X)ecution links      : ");
 #ifndef NEVER_ALLOW_REMOTE_EXEC
     addstr(               local_exec ? "ALWAYS ON           " :
 	  (local_exec_on_local_files ? "FOR LOCAL FILES ONLY" :
diff --git a/userdefs.h b/userdefs.h
index 8cd51748..52ce341f 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1244,12 +1244,12 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.2pre.6"
+#define LYNX_VERSION "2.8.2pre.7"
 #define LYNX_WWW_HOME "http://lynx.browser.org/"
 #define LYNX_WWW_DIST "http://www.slcc.edu/lynx/current/"
 #define LYNX_RELEASE FALSE
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Mon, 24 May 1999 13:00:53 -0600"
+#define LYNX_DATE "Tue, 25 May 1999 11:13:02 -0600"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 #define LYNX_RELEASE_DATE "1998"