[pkg-lynx-commits] [lynx-cur] 01/03: New upstream version 2.8.9dev15

Axel Beckert abe at deuxchevaux.org
Wed Jul 5 12:38:28 UTC 2017


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository lynx-cur.

commit 73bbf8d4ca048c4b30b8736514382b8259411787
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Jul 5 11:49:05 2017 +0200

    New upstream version 2.8.9dev15
---
 CHANGES                                   |   31 +-
 COPYING                                   |   39 +-
 COPYING.asc                               |    8 +-
 PACKAGE/debian/changelog                  |    4 +-
 PACKAGE/debian/copyright                  |   29 +-
 PACKAGE/debian/lynx-dev.lintian-overrides |    9 +
 PACKAGE/debian/menu                       |    2 +-
 PACKAGE/debian/rules                      |    8 +-
 PACKAGE/lynx.nsi                          |    6 +-
 PACKAGE/lynx.spec                         |    4 +-
 PACKAGE/version.iss                       |    2 +-
 WWW/Library/Implementation/HTFTP.c        |   27 +-
 WWW/Library/Implementation/HTFile.c       |    5 +-
 WWW/Library/Implementation/HTFormat.c     |   16 +-
 WWW/Library/Implementation/HTMIME.c       |    9 +-
 WWW/Library/Implementation/HTRules.c      |    5 +-
 WWW/Library/Implementation/HTTCP.c        |    8 +-
 WWW/Library/Implementation/HTUtils.h      |   23 +-
 WWW/Library/Implementation/SGML.c         |    6 +-
 WWW/Library/Implementation/makefile.in    |    4 +-
 WWW/Library/vms/COPYING.LIB               |   20 +-
 aclocal.m4                                |   49 +-
 config.sub                                |   11 +-
 configure                                 | 8166 +++++++++++++++--------------
 configure.in                              |    8 +-
 lynx.cfg                                  |   37 +-
 lynx.hlp                                  |  144 +-
 lynx.man                                  |    9 +-
 lynx_help/Lynx_users_guide.html           |   25 +-
 makefile.in                               |    4 +-
 po/eo.po                                  | 2891 +++++-----
 po/lynx.pot                               |  669 +--
 scripts/collapse-br                       |  162 +
 src/GridText.c                            |   12 +-
 src/HTAlert.c                             |    4 +-
 src/HTFWriter.c                           |    6 +-
 src/HTML.c                                |   29 +-
 src/LYCharUtils.c                         |    3 +-
 src/LYCurses.c                            |    4 +-
 src/LYGlobalDefs.h                        |    3 +-
 src/LYIcon.rc                             |   10 +-
 src/LYMain.c                              |   11 +-
 src/LYMainLoop.c                          |   17 +-
 src/LYOptions.c                           |   56 +-
 src/LYReadCFG.c                           |    3 +-
 src/LYStrings.c                           |   37 +-
 src/LYUtils.c                             |   22 +-
 src/LYrcFile.c                            |    4 +-
 src/LYrcFile.h                            |    3 +-
 src/chrtrans/makefile.in                  |    4 +-
 src/makefile.in                           |    4 +-
 userdefs.h                                |    6 +-
 52 files changed, 6622 insertions(+), 6056 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1118826..ad8382a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,37 @@
--- $LynxId: CHANGES,v 1.889 2017/04/29 14:43:40 tom Exp $
+-- $LynxId: CHANGES,v 1.908 2017/07/04 22:48:35 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2017-07-04 (2.8.9dev.15)
+* add note in lynx.cfg about default values (Debian #408448) -TD
+* amended Backes' change to the COLLAPSE_BR_TAGS feature for compatibility -TD
+  + use ENABLE_LYNXRC to determine whether it is written to the .lynxrc file.
+  + add command-line option, etc., for controlling whether blank lines are
+    trimmed, e.g., trailing lines as well as the special case for collapsing
+    br-tags.  Leading blank lines at the top of the document are untouched.
+  + modify limit for trimmed lines to retain as little as 1 line; previously
+    the trimming would go no smaller than 2 lines.
+* add command-line option and options-menu item for COLLAPSE_BR_TAGS (patch
+  by Peter Backes).
+* fix strict gcc7 warnings on OSX, aside from those due to incorrect system
+  headers -TD
+* adjust definition of alloca() in HTUtils.h to quiet bogus compiler warning
+  with NetBSD 7 -TD
+* add configure check for preprocessor -C option, overlooked in c99 -TD
+* correct logic in HTCopy() when re-reading a page (Debian #863008) -TD
+* fix lintian warnings in ".deb" test-package -TD
+* build-fix for PGI compilers, e.g., symbol conflicts -TD
+* update eo.po from
+    http://translationproject.org/latest/lynx
+
+2017-05-10 (2.8.9dev.14)
+* amend fix for Debian #841155, adding check for complete multibyte strings to
+  decide when the cell-limit has been met (Debian #862148) -TD
+* minor improvements to configure script to reduce warnings in config.log -TD
+* update config.sub (2017-04-02)
+* compiler-warning fixes for c99 on OSX -TD
+
 2017-04-29 (2.8.9dev.13)
 * amend fix for Debian #841155, adding check for special case where the
   expected number of cells is zero (report by Larry Hynes) -TD
diff --git a/COPYING b/COPYING
index ccbfd0d..01b6151 100644
--- a/COPYING
+++ b/COPYING
@@ -1,14 +1,14 @@
 See the COPYHEADER file which gives copyright information for Lynx.
 ------------------------------------------------------------------------------
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -17,7 +17,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -57,8 +57,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-

-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -112,7 +112,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-

+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -170,7 +170,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-

+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -227,7 +227,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-

+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -257,7 +257,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -279,9 +279,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-

-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -305,10 +305,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -338,5 +337,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/COPYING.asc b/COPYING.asc
index 4c10789..d95eb5c 100644
--- a/COPYING.asc
+++ b/COPYING.asc
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.12 (GNU/Linux)
 Comment: See http://invisible-island.net/public/public.html for info
 
-iD8DBQBFJtJ/cCNT4PfkjtsRArLIAJ4gKHdikok6gCcKfizm9T3HdEEP+wCfUj+N
-9sC1gLEOekFUgKVqYsSTP+w=
-=aDfb
+iEYEABECAAYFAllK95IACgkQcCNT4PfkjtvvMQCfTRukMJdeFcMrh90cS7VdvjzF
+etwAn1ZyAO6hHcIqxdbZpsu0ciSOmuYe
+=2fkf
 -----END PGP SIGNATURE-----
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 1878851..e19b97f 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.13) unstable; urgency=low
+lynx-dev (2.8.9dev.15) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey at invisible-island.net>  Sat, 29 Apr 2017 08:47:15 -0400
+ -- Thomas E. Dickey <dickey at invisible-island.net>  Thu, 11 May 2017 17:22:30 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright
index 5eb37df..7832bef 100644
--- a/PACKAGE/debian/copyright
+++ b/PACKAGE/debian/copyright
@@ -4,6 +4,9 @@ Current maintainer: Thomas Dickey <dickey at invisible-island.net>
 
 -------------------------------------------------------------------------------
 
+Copyright 1997-2016,2017 Thomas E. Dickey
+Copyright (C) 1995 University of Kansas.
+
 Most of the content of the lynx release (and corresponding copyright) is
 the work of developers on the lynx-dev mailing list, who have agreed to
 distribute their work under the terms and conditions of the GNU General
@@ -19,30 +22,6 @@ or to the maintainer (Thomas E. Dickey):
 
 	dickey at invisible-island.net
 
-For reference, below is the original copyright notice for Lynx (2.4.2).
-------------------------------------------------------------------------------
-/* Copyright (C) 1995 University of Kansas.
-
-   This file is part of Lynx, a text-based WWW browser.
-
-   Lynx is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License, version 2, as
-   published by the Free Software Foundation.
-
-   Lynx is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-   License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Lynx; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
-
-   Any licensing or usage questions should be directed to Michael
-   Grobe <grobe at ukans.edu>.
-*/
-
 -------------------------------------------------------------------------------
 
 Files: aclocal.m4
@@ -101,7 +80,7 @@ License: other-BSD
     shared with many OS's install programs.
 
 Files: debian/*
-Copyright:  2010-2015,2016 Thomas E. Dickey
+Copyright:  2010-2016,2017 Thomas E. Dickey
 License: other-BSD
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
diff --git a/PACKAGE/debian/lynx-dev.lintian-overrides b/PACKAGE/debian/lynx-dev.lintian-overrides
new file mode 100644
index 0000000..280b562
--- /dev/null
+++ b/PACKAGE/debian/lynx-dev.lintian-overrides
@@ -0,0 +1,9 @@
+# Lynx's version-numbering is not understood by lintian, though legal.
+lynx-dev: rc-version-greater-than-expected-version 2.8.9dev.15 > 2.8.9 (consider using 2.8.9~dev.15)
+
+# This is intentional because it is referenced from the documentation.
+lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING
+
+# These are intentional, part of the sample files:
+lynx-dev: zero-byte-file-in-doc-directory usr/share/doc/lynx-dev/test/X
+lynx-dev: zero-byte-file-in-doc-directory usr/share/doc/lynx-dev/test/nobody
diff --git a/PACKAGE/debian/menu b/PACKAGE/debian/menu
index 1df6ef8..6421345 100644
--- a/PACKAGE/debian/menu
+++ b/PACKAGE/debian/menu
@@ -1,2 +1,2 @@
 ?package(lynx-dev):needs="text" section="Applications/Network/Web Browsing"\
-  title="Lynx-dev" command="lynx"
+  title="Lynx-dev" command="lynx-dev"
diff --git a/PACKAGE/debian/rules b/PACKAGE/debian/rules
index c9a2226..99695b1 100755
--- a/PACKAGE/debian/rules
+++ b/PACKAGE/debian/rules
@@ -22,7 +22,9 @@ helpdir		:= $(docdir)/help_dir
 DSTDIR		:= $(CURDIR)/debian/$(PACKAGE)
 DOCDIR		:= $(DSTDIR)$(docdir)
 
-CFLAGS =
+CPPFLAGS	:= $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS		:= $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS		:= $(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 DEBOP=--enable-debug
@@ -48,6 +50,9 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
+	CPPFLAGS="$(CPPFLAGS)" \
+	CFLAGS="$(CFLAGS)" \
+	LDFLAGS="$(LDFLAGS)" \
 	env cf_cv_SYSTEM_MAIL=/usr/sbin/sendmail \
 		COMPRESS=/usr/bin/compress \
 		BZIP2=/bin/bzip2 \
@@ -163,6 +168,7 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+	dh_lintian
 	dh_installdebconf
 	dh_installdocs
 	dh_installmenu
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 08cb9c9..b7e594b 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.34 2017/04/29 12:47:15 tom Exp $
+; $LynxId: lynx.nsi,v 1.36 2017/05/11 21:22:30 tom Exp $
 ; Script originally generated with the Venis Install Wizard, but customized.
 ; The Inno Setup script is preferred; but this can be built via cross-compiling.
 
@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"
 !define VERSION_MAJOR "8"
 !define VERSION_MINOR "9"
-!define VERSION_LEVEL "1013"
-!define VERSION_PATCH "dev.13"
+!define VERSION_LEVEL "1015"
+!define VERSION_PATCH "dev.15"
 
 !define SUBKEY "Lynx"
 
diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 1445aeb..63dbde3 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.40 2017/04/29 12:47:15 tom Exp $
+# $LynxId: lynx.spec,v 1.42 2017/05/11 21:22:30 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.13
+Release: dev.15
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index a2b5727..588852f 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.
 
 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
-#define LYNX_VERSION "2.8.9dev.13"
+#define LYNX_VERSION "2.8.9dev.15"
 
 ; most-recent full release and target
 #define LYNX_RELEASE "2.8.9"
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 03781a6..da6cc47 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.128 2016/11/24 23:43:55 tom Exp $
+ * $LynxId: HTFTP.c,v 1.129 2017/07/02 20:42:32 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -2324,6 +2324,7 @@ static EntryInfo *parse_dir_entry(char *entry,
 	    break;
 	}
 	/* fall through if server_type changed for *first == TRUE ! */
+	/* FALLTHRU */
     case UNIX_SERVER:
     case PETER_LEWIS_SERVER:
     case MACHTEN_SERVER:
@@ -2706,7 +2707,8 @@ static char *FormatSize(char **bufp,
     char fmt[512];
 
     if (*start) {
-	sprintf(fmt, "%%%.*s" PRI_off_t, (int) sizeof(fmt) - 3, start);
+	sprintf(fmt, "%%%.*s" PRI_off_t,
+		  (int) sizeof(fmt) - DigitsOf(start) - 3, start);
 
 	HTSprintf(bufp, fmt, value);
     } else {
@@ -2724,7 +2726,8 @@ static char *FormatNum(char **bufp,
     char fmt[512];
 
     if (*start) {
-	sprintf(fmt, "%%%.*sld", (int) sizeof(fmt) - 3, start);
+	sprintf(fmt, "%%%.*sld",
+		(int) sizeof(fmt) - DigitsOf(start) - 3, start);
 	HTSprintf(bufp, fmt, value);
     } else {
 	sprintf(fmt, "%lu", value);
@@ -3951,12 +3954,22 @@ int HTFTPLoad(const char *name,
 	     */
 	    if (control->is_binary) {
 		int code;
-		off_t size;
 
 		status = send_cmd_2("SIZE", filename);
-		if (status == 2 &&
-		    sscanf(response_text, "%d %" PRI_off_t, &code, &size) == 2) {
-		    anchor->content_length = size;
+		if (status == 2) {
+#if !defined(HAVE_LONG_LONG) && defined(GUESS_PRI_off_t)
+		    long size;
+
+		    if (sscanf(response_text, "%d %ld", &code, &size) == 2) {
+			anchor->content_length = (off_t) size;
+		    }
+#else
+		    off_t size;
+		    if (sscanf(response_text, "%d %" SCN_off_t, &code, &size)
+			== 2) {
+			anchor->content_length = size;
+		    }
+#endif
 		}
 	    }
 	    status = send_cmd_2("RETR", filename);
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index ffb2332..77817a4 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.146 2017/04/27 20:51:05 tom Exp $
+ * $LynxId: HTFile.c,v 1.147 2017/07/02 20:42:33 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -208,7 +208,8 @@ static char *FormatSize(char **bufp,
     char fmt[512];
 
     if (*start) {
-	sprintf(fmt, "%%%.*s" PRI_off_t, (int) sizeof(fmt) - 3, start);
+	sprintf(fmt, "%%%.*s" PRI_off_t,
+		  (int) sizeof(fmt) - DigitsOf(start) - 3, start);
 
 	HTSprintf0(bufp, fmt, entry);
     } else {
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index 1ba5f19..ccab7d8 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.c,v 1.85 2016/11/24 15:29:50 tom Exp $
+ * $LynxId: HTFormat.c,v 1.86 2017/07/02 17:09:45 tom Exp $
  *
  *		Manage different file formats			HTFormat.c
  *		=============================
@@ -732,8 +732,7 @@ int HTCopy(HTParentAnchor *anchor,
     HTStreamClass targetClass;
     BOOL suppress_readprogress = NO;
     off_t limit = anchor ? anchor->content_length : 0;
-    off_t bytes = anchor ? anchor->actual_length : 0;
-    off_t total;
+    off_t bytes = 0;
     int rv = 0;
 
     /*  Push the data down the stream
@@ -865,13 +864,8 @@ int HTCopy(HTParentAnchor *anchor,
 	}
 #endif /* NOT_ASCII */
 
-	total = bytes + status;
-	if (limit == 0 || bytes == 0 || (total < limit)) {
-	    (*targetClass.put_block) (sink, input_buffer, status);
-	} else if (bytes < limit) {
-	    (*targetClass.put_block) (sink, input_buffer, (int) (limit - bytes));
-	}
-	bytes = total;
+	(*targetClass.put_block) (sink, input_buffer, status);
+	bytes += status;
 	if (!suppress_readprogress)
 	    HTReadProgress(bytes, limit);
 	HTDisplayPartial();
@@ -879,7 +873,7 @@ int HTCopy(HTParentAnchor *anchor,
 	/* a few buggy implementations do not close the connection properly
 	 * and will hang if we try to read past the declared content-length.
 	 */
-	if (limit > 0 && bytes == limit)
+	if (limit > 0 && bytes >= limit)
 	    break;
     }				/* next bufferload */
     if (anchor != 0) {
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 909fbb5..1644793 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.93 2017/02/10 22:27:42 tom Exp $
+ * $LynxId: HTMIME.c,v 1.95 2017/07/02 19:40:06 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -2004,7 +2004,7 @@ static void HTMIME_put_character(HTStream *me, int c)
     case miWWW_AUTHENTICATE:
 	me->field = me->state;	/* remember it */
 	me->state = miSKIP_GET_VALUE;
-	/* Fall through! */
+	/* FALLTHRU */
 
     case miSKIP_GET_VALUE:
 	if (c == '\n') {
@@ -2021,6 +2021,7 @@ static void HTMIME_put_character(HTStream *me, int c)
 	me->value_pointer = me->value;
 	me->state = miGET_VALUE;
 	/* Fall through to store first character */
+	/* FALLTHRU */
 
     case miGET_VALUE:
       GET_VALUE:
@@ -2033,6 +2034,7 @@ static void HTMIME_put_character(HTStream *me, int c)
 	    }
 	}
 	/* Fall through (if end of line) */
+	/* FALLTHRU */
 
     case miJUNK_LINE:
 	if (c == '\n') {
@@ -2047,7 +2049,8 @@ static void HTMIME_put_character(HTStream *me, int c)
     HTChunkPutc(&me->anchor->http_headers, UCH(c));
     if (me->state == MIME_TRANSPARENT) {
 	HTChunkTerminate(&me->anchor->http_headers);
-	CTRACE((tfp, "Server Headers:\n%.*s\n",
+	CTRACE((tfp, "Server Headers (%d bytes):\n%.*s\n",
+		me->anchor->http_headers.size,
 		me->anchor->http_headers.size,
 		me->anchor->http_headers.data));
 	CTRACE((tfp, "Server Content-Type:%s\n",
diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c
index b1e263b..91ac93d 100644
--- a/WWW/Library/Implementation/HTRules.c
+++ b/WWW/Library/Implementation/HTRules.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTRules.c,v 1.46 2016/11/24 15:29:50 tom Exp $
+ * $LynxId: HTRules.c,v 1.47 2017/07/02 19:45:22 tom Exp $
  *
  *	Configuration manager for Hypertext Daemon		HTRules.c
  *	==========================================
@@ -291,6 +291,7 @@ char *HTTranslate(const char *required)
 	case HT_Progress:
 	case HT_Alert:
 	    LYFixCursesOn("show rule message:");	/* and fall through */
+	    /* FALLTHRU */
 	case HT_AlwaysAlert:
 	    pMsg = r->equiv ? r->equiv :
 		(r->op == HT_AlwaysAlert) ? "%s" : "Rule: %s";
@@ -335,7 +336,7 @@ char *HTTranslate(const char *required)
 		CTRACE((tfp, "HTRule: Pass `%s'\n", current));
 		return current;
 	    }
-	    /* Else fall through ...to map and pass */
+	    /* FALLTHRU */
 
 	case HT_Map:
 	case HT_Redirect:
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index f164871..87de04b 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.137 2017/01/02 02:11:14 tom Exp $
+ * $LynxId: HTTCP.c,v 1.138 2017/04/30 17:52:00 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -389,7 +389,7 @@ static void dump_hostent(const char *msgprefix,
 
 	CTRACE((tfp, "%s: %p ", msgprefix, (const void *) phost));
 	if (phost) {
-	    CTRACE((tfp, "{ h_name = %p", phost->h_name));
+	    CTRACE((tfp, "{ h_name = %p", (void *) phost->h_name));
 	    if (phost->h_name) {
 		CTRACE((tfp, " \"%s\",", phost->h_name));
 	    } else {
@@ -401,7 +401,7 @@ static void dump_hostent(const char *msgprefix,
 		for (pcnt = phost->h_aliases; *pcnt; pcnt++) {
 		    CTRACE((tfp, "%s %p \"%s\"",
 			    (pcnt == phost->h_aliases ? " " : ", "),
-			    *pcnt, *pcnt));
+			    (void *) *pcnt, *pcnt));
 		}
 		CTRACE((tfp, "%s0x0 },\n\t",
 			(*phost->h_aliases ? ", " : " ")));
@@ -416,7 +416,7 @@ static void dump_hostent(const char *msgprefix,
 		for (pcnt = phost->h_addr_list; *pcnt; pcnt++) {
 		    CTRACE((tfp, "%s %p",
 			    (pcnt == phost->h_addr_list ? "" : ","),
-			    *pcnt));
+			    (void *) *pcnt));
 		    for (i = 0; i < phost->h_length; i++) {
 			CTRACE((tfp, "%s%d%s", (i == 0 ? " \"" : "."),
 				(int) *((unsigned char *) (*pcnt) + i),
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 744557a..bd6391b 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.122 2016/11/23 22:16:51 tom Exp $
+ * $LynxId: HTUtils.h,v 1.124 2017/07/02 20:40:14 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -19,11 +19,11 @@
 
 /* see AC_FUNC_ALLOCA macro */
 #ifdef __GNUC__
-# define alloca __builtin_alloca
+# define alloca(size) __builtin_alloca(size)
 #else
 # ifdef _MSC_VER
 #  include <malloc.h>
-#  define alloca _alloca
+#  define alloca(size) _alloca(size)
 # else
 #  if HAVE_ALLOCA_H
 #   include <alloca.h>
@@ -191,7 +191,11 @@ extern int ignore_unused;
 #undef small			/* see <w32api/rpcndr.h> */
 #endif
 
-#ifdef HAVE_ATOLL
+#if defined(__DARWIN_NO_LONG_LONG)
+#undef HAVE_ATOLL
+#endif
+
+#if defined(HAVE_ATOLL)
 #define LYatoll(n) atoll(n)
 #else
 extern off_t LYatoll(const char *value);
@@ -575,6 +579,8 @@ extern int WWW_TraceMask;
 #include <inttypes.h>
 #endif
 
+#define DigitsOf(type)  (int)((sizeof(type)*8)/3)
+
 /*
  * Printing/scanning-formats for "off_t", as well as cast needed to fit.
  */
@@ -602,13 +608,18 @@ extern int WWW_TraceMask;
 #endif
 
 #ifndef PRI_off_t
-#if defined(HAVE_LONG_LONG) && (SIZEOF_OFF_T > SIZEOF_LONG)
+#define GUESS_PRI_off_t
+#if (SIZEOF_OFF_T == SIZEOF_LONG)
+#define PRI_off_t	"ld"
+#define SCN_off_t	"ld"
+#define CAST_off_t(n)	(long)(n)
+#elif defined(HAVE_LONG_LONG)
 #define PRI_off_t	"lld"
 #define SCN_off_t	"lld"
 #define CAST_off_t(n)	(long long)(n)
 #else
 #define PRI_off_t	"ld"
-#define SCN_off_t	"ld"
+/* SCN_off_t requires workaround */
 #define CAST_off_t(n)	(long)(n)
 #endif
 #endif
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 138ce33..3087f0b 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.160 2017/01/01 00:56:18 Takeshi.Hataguchi Exp $
+ * $LynxId: SGML.c,v 1.161 2017/07/02 19:45:00 tom Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -1895,7 +1895,7 @@ static void SGML_character(HTStream *me, int c_in)
 	if (!(c == '>' && me->slashedtag && TOASCII(clong) < 127)) {
 	    me->state = S_text;
 	}
-	/* fall through in any case! */
+	/* FALLTHRU */
     case S_text:
 	if (IS_CJK_TTY && ((TOASCII(c) & 0200) != 0)
 #ifdef EXP_JAPANESEUTF8_SUPPORT
@@ -3567,7 +3567,7 @@ static void SGML_character(HTStream *me, int c_in)
 	    PSRCSTART(attrval);
 #endif
 	me->state = S_value;
-	/*  no break!  fall through to S_value and process current `c`   */
+	/* FALLTHRU */
 
     case S_value:
 	if (WHITE(c) || (c == '>')) {	/* End of word */
diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in
index 50d3389..e5a2754 100644
--- a/WWW/Library/Implementation/makefile.in
+++ b/WWW/Library/Implementation/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.32 2015/12/13 23:20:11 tom Exp $
+# $LynxId: makefile.in,v 1.33 2017/07/04 22:45:38 tom Exp $
 # Make WWW under unix for a.n.other unix system (bsd)
 # Use this as a template
 
@@ -170,7 +170,7 @@ lint:
 
 .c.i:
 	@RULE_CC@
-	@ECHO_CC@$(CPP) -C $(CPPOPTS) $(srcdir)/$*.c >$@
+	@ECHO_CC@$(CPP) $(CPPOPTS) $(srcdir)/$*.c >$@
 
 depend :
 	makedepend -fmakefile -- $(CFLAGS) -- $(CFILES)
diff --git a/WWW/Library/vms/COPYING.LIB b/WWW/Library/vms/COPYING.LIB
index eb685a5..5bc8fb2 100644
--- a/WWW/Library/vms/COPYING.LIB
+++ b/WWW/Library/vms/COPYING.LIB
@@ -1,15 +1,15 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 [This is the first released version of the library GPL.  It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
 

-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 

-     Appendix: How to Apply These Terms to Your New Libraries
+           How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
@@ -463,8 +463,8 @@ convey the exclusion of warranty; and each file should have at least the
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/aclocal.m4 b/aclocal.m4
index f76517c..6d9da01 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.235 2017/04/27 09:15:35 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.237 2017/07/02 18:31:56 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey at invisible-island.net>
 dnl and Jim Spath <jspath at mail.bcpl.lib.md.us>
@@ -2665,7 +2665,7 @@ AC_TRY_LINK([
 test "$cf_cv_fionbio" = "fcntl" && AC_DEFINE(USE_FCNTL,1,[Define to 1 if we should use fcntl])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_CURSES_VERSION version: 6 updated: 2012/10/06 16:39:58
+dnl CF_FUNC_CURSES_VERSION version: 7 updated: 2017/05/10 18:31:29
 dnl ----------------------
 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
 dnl It's a character string "SVR4", not documented.
@@ -2674,7 +2674,7 @@ AC_DEFUN([CF_FUNC_CURSES_VERSION],
 AC_CACHE_CHECK(for function curses_version, cf_cv_func_curses_version,[
 AC_TRY_RUN([
 #include <${cf_cv_ncurses_header:-curses.h}>
-int main()
+int main(void)
 {
 	char temp[1024];
 	sprintf(temp, "%s\n", curses_version());
@@ -2687,7 +2687,7 @@ rm -f core])
 test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GETADDRINFO version: 8 updated: 2012/11/08 20:57:52
+dnl CF_FUNC_GETADDRINFO version: 9 updated: 2017/05/10 18:31:29
 dnl -------------------
 dnl Look for a working version of getaddrinfo(), for IPV6 support.
 AC_DEFUN([CF_FUNC_GETADDRINFO],[
@@ -2701,7 +2701,7 @@ AC_TRY_RUN([
 
 #define expect(a,b) if (strcmp(a,b) != 0) goto bad
 
-int main()
+int main(void)
 {
    int passive, gaierr, inet4 = 0, inet6 = 0;
    struct addrinfo hints, *ai, *aitop;
@@ -4049,7 +4049,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 14 updated: 2012/10/06 08:57:51
+dnl CF_NCURSES_VERSION version: 15 updated: 2017/05/09 19:26:10
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -4064,7 +4064,7 @@ AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
 	AC_TRY_RUN([
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
-int main()
+int main(void)
 {
 	FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
@@ -4686,6 +4686,37 @@ CF_ACVERSION_CHECK(2.52,
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PROG_CPP_COMMENTS version: 1 updated: 2017/07/02 14:31:07
+dnl --------------------
+dnl Ask for preprocessor "-C" option if we can get it.
+AC_DEFUN([CF_PROG_CPP_COMMENTS],[
+AC_REQUIRE([AC_PROG_CPP])
+AC_MSG_CHECKING(if preprocessor -C option works)
+AC_CACHE_VAL(cf_cv_prog_cpp_comments,[
+cf_cv_prog_cpp_comments=no
+cat >conftest.c <<CF_EOF
+int main(void)
+{
+	/* COMMENT */
+	return 0;
+}
+CF_EOF
+if ( $CPP -C conftest.c >conftest.i 2>/dev/null )
+then
+	if ( grep COMMENT conftest.i >/dev/null 2>/dev/null )
+	then
+		cf_cv_prog_cpp_comments=yes
+	fi
+fi
+rm -f conftest.[[ci]]
+])
+AC_MSG_RESULT($cf_cv_prog_cpp_comments)
+if test x$cf_cv_prog_cpp_comments = xyes
+then
+	CPP="$CPP -C"
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_PROG_EXT version: 13 updated: 2015/04/18 09:03:58
 dnl -----------
 dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
@@ -4919,7 +4950,7 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SET_ERRNO version: 5 updated: 2012/11/08 20:57:52
+dnl CF_SET_ERRNO version: 6 updated: 2017/05/10 18:31:29
 dnl ------------
 dnl Check if 'errno' is declared in a fashion that lets us set it.
 AC_DEFUN([CF_SET_ERRNO],
@@ -4927,7 +4958,7 @@ AC_DEFUN([CF_SET_ERRNO],
 AC_CACHE_CHECK(if we can set errno,cf_cv_set_errno,[
 AC_TRY_RUN([
 #include <errno.h>
-int main()
+int main(void)
 {
 	errno = 255;
 	${cf_cv_main_return:-return}(errno != 255);
diff --git a/config.sub b/config.sub
index 87abeab..40ea5df 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-02-07'
+timestamp='2017-04-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -263,7 +263,7 @@ case $basic_machine in
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
@@ -315,6 +315,7 @@ case $basic_machine in
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
+	| wasm32 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -388,7 +389,7 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
@@ -446,6 +447,7 @@ case $basic_machine in
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
+	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -1246,6 +1248,9 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
+	wasm32)
+		basic_machine=wasm32-unknown
+		;;
 	w65*)
 		basic_machine=w65-wdc
 		os=-none
diff --git a/configure b/configure
index e1d071d..53e0bc9 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in 2.8.9dev.13.
+# From configure.in 2.8.9dev.15.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20150926.
+# Generated by Autoconf 2.52.20170501.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -880,7 +880,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20150926.  Invocation command line was
+generated by GNU Autoconf 2.52.20170501.  Invocation command line was
 
   $ $0 $@
 
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.13
+VERSION=2.8.9dev.15
 
 echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
@@ -1650,7 +1650,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -1781,7 +1781,7 @@ else
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -1825,7 +1825,7 @@ else
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -1873,7 +1873,7 @@ else
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -1953,7 +1953,7 @@ do
 #include <stdlib.h>
 $ac_declaration
 int
-main ()
+main (void)
 {
 exit (42);
   ;
@@ -1984,7 +1984,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 #include "confdefs.h"
 $ac_declaration
 int
-main ()
+main (void)
 {
 exit (42);
   ;
@@ -2078,7 +2078,7 @@ int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, i
 int argc;
 char **argv;
 int
-main ()
+main (void)
 {
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   ;
@@ -2475,27 +2475,59 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
-echo "$as_me:2478: checking whether ln -s works" >&5
+echo "$as_me:2478: checking if preprocessor -C option works" >&5
+echo $ECHO_N "checking if preprocessor -C option works... $ECHO_C" >&6
+if test "${cf_cv_prog_cpp_comments+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_cv_prog_cpp_comments=no
+cat >conftest.c <<CF_EOF
+int main(void)
+{
+	/* COMMENT */
+	return 0;
+}
+CF_EOF
+if ( $CPP -C conftest.c >conftest.i 2>/dev/null )
+then
+	if ( grep COMMENT conftest.i >/dev/null 2>/dev/null )
+	then
+		cf_cv_prog_cpp_comments=yes
+	fi
+fi
+rm -f conftest.[ci]
+
+fi
+
+echo "$as_me:2503: result: $cf_cv_prog_cpp_comments" >&5
+echo "${ECHO_T}$cf_cv_prog_cpp_comments" >&6
+if test x$cf_cv_prog_cpp_comments = xyes
+then
+	CPP="$CPP -C"
+fi
+
+echo "$as_me:2510: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2482: result: yes" >&5
+  echo "$as_me:2514: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2485: result: no, using $LN_S" >&5
+  echo "$as_me:2517: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 case $host_os in
 (mingw*)
 LN_S="cp -p"
-echo "$as_me:2492: result: Override: No symbolic links in mingw." >&5
+echo "$as_me:2524: result: Override: No symbolic links in mingw." >&5
 echo "${ECHO_T}Override: No symbolic links in mingw." >&6
 	;;
 (*)
 	;;
 esac
-echo "$as_me:2498: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2530: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2515,11 +2547,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2518: result: yes" >&5
+  echo "$as_me:2550: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2522: result: no" >&5
+  echo "$as_me:2554: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2536,7 +2568,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2539: checking for a BSD compatible install" >&5
+echo "$as_me:2571: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2585,7 +2617,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2588: result: $INSTALL" >&5
+echo "$as_me:2620: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2600,7 +2632,7 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2603: checking for $ac_word" >&5
+echo "$as_me:2635: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2615,7 +2647,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:2618: found $ac_dir/$ac_word" >&5
+echo "$as_me:2650: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2623,10 +2655,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2626: result: $YACC" >&5
+  echo "$as_me:2658: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2629: result: no" >&5
+  echo "$as_me:2661: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2638,7 +2670,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2641: checking for $ac_word" >&5
+echo "$as_me:2673: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2653,7 +2685,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2656: found $ac_dir/$ac_word" >&5
+echo "$as_me:2688: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2661,17 +2693,17 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2664: result: $LINT" >&5
+  echo "$as_me:2696: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2667: result: no" >&5
+  echo "$as_me:2699: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
-echo "$as_me:2674: checking for makeflags variable" >&5
+echo "$as_me:2706: checking for makeflags variable" >&5
 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
 if test "${cf_cv_makeflags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2705,10 +2737,10 @@ CF_EOF
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2708: result: $cf_cv_makeflags" >&5
+echo "$as_me:2740: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2711: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2743: checking if filesystem supports mixed-case filenames" >&5
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2735,7 +2767,7 @@ else
 fi
 
 fi
-echo "$as_me:2738: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2770: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -2746,7 +2778,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2749: checking for $ac_word" >&5
+echo "$as_me:2781: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CTAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2761,7 +2793,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:2764: found $ac_dir/$ac_word" >&5
+echo "$as_me:2796: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2769,10 +2801,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2772: result: $CTAGS" >&5
+  echo "$as_me:2804: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2775: result: no" >&5
+  echo "$as_me:2807: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2783,7 +2815,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2786: checking for $ac_word" >&5
+echo "$as_me:2818: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ETAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2798,7 +2830,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:2801: found $ac_dir/$ac_word" >&5
+echo "$as_me:2833: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2806,10 +2838,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2809: result: $ETAGS" >&5
+  echo "$as_me:2841: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2812: result: no" >&5
+  echo "$as_me:2844: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2818,7 +2850,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:2821: checking for $ac_word" >&5
+echo "$as_me:2853: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2833,7 +2865,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2836: found $ac_dir/$ac_word" >&5
+echo "$as_me:2868: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2842,17 +2874,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2845: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2877: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2848: result: no" >&5
+  echo "$as_me:2880: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
 set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:2855: checking for $ac_word" >&5
+echo "$as_me:2887: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2867,7 +2899,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2870: found $ac_dir/$ac_word" >&5
+echo "$as_me:2902: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2876,10 +2908,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2879: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2911: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2882: result: no" >&5
+  echo "$as_me:2914: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2902,7 +2934,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:2905: checking for $ac_word" >&5
+echo "$as_me:2937: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2919,7 +2951,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:2922: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2954: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2930,10 +2962,10 @@ fi
 WINDRES=$ac_cv_path_WINDRES
 
 if test -n "$WINDRES"; then
-  echo "$as_me:2933: result: $WINDRES" >&5
+  echo "$as_me:2965: result: $WINDRES" >&5
 echo "${ECHO_T}$WINDRES" >&6
 else
-  echo "$as_me:2936: result: no" >&5
+  echo "$as_me:2968: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2942,7 +2974,7 @@ if test -z "$ac_cv_path_WINDRES"; then
   ac_pt_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-echo "$as_me:2945: checking for $ac_word" >&5
+echo "$as_me:2977: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2959,7 +2991,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:2962: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2994: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2971,10 +3003,10 @@ fi
 ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
 
 if test -n "$ac_pt_WINDRES"; then
-  echo "$as_me:2974: result: $ac_pt_WINDRES" >&5
+  echo "$as_me:3006: result: $ac_pt_WINDRES" >&5
 echo "${ECHO_T}$ac_pt_WINDRES" >&6
 else
-  echo "$as_me:2977: result: no" >&5
+  echo "$as_me:3009: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3002,7 +3034,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:3005: checking for $ac_word" >&5
+echo "$as_me:3037: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3017,7 +3049,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:3020: found $ac_dir/$ac_word" >&5
+echo "$as_me:3052: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3025,10 +3057,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:3028: result: $BUILD_CC" >&5
+  echo "$as_me:3060: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:3031: result: no" >&5
+  echo "$as_me:3063: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3036,12 +3068,12 @@ fi
 done
 
 fi;
-	echo "$as_me:3039: checking for native build C compiler" >&5
+	echo "$as_me:3071: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:3041: result: $BUILD_CC" >&5
+	echo "$as_me:3073: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:3044: checking for native build C preprocessor" >&5
+	echo "$as_me:3076: checking for native build C preprocessor" >&5
 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.
@@ -3051,10 +3083,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:3054: result: $BUILD_CPP" >&5
+	echo "$as_me:3086: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:3057: checking for native build C flags" >&5
+	echo "$as_me:3089: checking for native build C flags" >&5
 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.
@@ -3062,10 +3094,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:3065: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:3097: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:3068: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:3100: checking for native build C preprocessor-flags" >&5
 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.
@@ -3073,10 +3105,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:3076: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:3108: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:3079: checking for native build linker-flags" >&5
+	echo "$as_me:3111: checking for native build linker-flags" >&5
 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.
@@ -3084,10 +3116,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:3087: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:3119: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:3090: checking for native build linker-libraries" >&5
+	echo "$as_me:3122: checking for native build linker-libraries" >&5
 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.
@@ -3095,7 +3127,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:3098: result: $BUILD_LIBS" >&5
+	echo "$as_me:3130: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -3105,7 +3137,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 	: ${BUILD_CC:='${CC}'}
 
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-		{ { echo "$as_me:3108: error: Cross-build requires two compilers.
+		{ { echo "$as_me:3140: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}
@@ -3126,7 +3158,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3129: checking for $ac_word" >&5
+echo "$as_me:3161: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3141,7 +3173,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3144: found $ac_dir/$ac_word" >&5
+echo "$as_me:3176: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3149,10 +3181,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3152: result: $RANLIB" >&5
+  echo "$as_me:3184: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3155: result: no" >&5
+  echo "$as_me:3187: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3161,7 +3193,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3164: checking for $ac_word" >&5
+echo "$as_me:3196: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3176,7 +3208,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
+echo "$as_me:3211: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3185,10 +3217,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3188: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3220: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3191: result: no" >&5
+  echo "$as_me:3223: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3200,7 +3232,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3203: checking for $ac_word" >&5
+echo "$as_me:3235: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3215,7 +3247,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:3218: found $ac_dir/$ac_word" >&5
+echo "$as_me:3250: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3223,10 +3255,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3226: result: $AR" >&5
+  echo "$as_me:3258: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3229: result: no" >&5
+  echo "$as_me:3261: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3235,7 +3267,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:3238: checking for $ac_word" >&5
+echo "$as_me:3270: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3250,7 +3282,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:3253: found $ac_dir/$ac_word" >&5
+echo "$as_me:3285: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3259,10 +3291,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3262: result: $ac_ct_AR" >&5
+  echo "$as_me:3294: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3265: result: no" >&5
+  echo "$as_me:3297: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3271,7 +3303,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3274: checking for options to update archives" >&5
+echo "$as_me:3306: checking for options to update archives" >&5
 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
 if test "${cf_cv_ar_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3294,13 +3326,13 @@ else
 		rm -f conftest.a
 
 		cat >conftest.$ac_ext <<EOF
-#line 3297 "configure"
+#line 3329 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-		if { (eval echo "$as_me:3300: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3303: \$? = $ac_status" >&5
+  echo "$as_me:3335: \$? = $ac_status" >&5
   (exit $ac_status); } ; then
 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
@@ -3311,7 +3343,7 @@ EOF
 		else
 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:3314: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3346: testing cannot compile test-program ..." 1>&5
 
 			break
 		fi
@@ -3319,7 +3351,7 @@ echo "${as_me:-configure}:3314: testing cannot compile test-program ..." 1>&5
 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
-echo "$as_me:3322: result: $cf_cv_ar_flags" >&5
+echo "$as_me:3354: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -3330,7 +3362,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:3333: checking if you want to see long compiling messages" >&5
+echo "$as_me:3365: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -3364,7 +3396,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:3367: result: $enableval" >&5
+echo "$as_me:3399: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -3374,7 +3406,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:3377: checking if you want to check memory-leaks" >&5
+echo "$as_me:3409: checking if you want to check memory-leaks" >&5
 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
@@ -3391,7 +3423,7 @@ else
 	with_leak_checks=no
 
 fi;
-echo "$as_me:3394: result: $with_leak_checks" >&5
+echo "$as_me:3426: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -3401,7 +3433,7 @@ EOF
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
-echo "$as_me:3404: checking if you want to enable debug-code" >&5
+echo "$as_me:3436: checking if you want to enable debug-code" >&5
 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -3418,7 +3450,7 @@ else
 	with_debug=no
 
 fi;
-echo "$as_me:3421: result: $with_debug" >&5
+echo "$as_me:3453: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -3443,7 +3475,7 @@ else
 	esac
 fi
 
-echo "$as_me:3446: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:3478: checking if you want to enable lynx trace code *recommended* " >&5
 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -3460,14 +3492,14 @@ else
 	with_trace=yes
 
 fi;
-echo "$as_me:3463: result: $with_trace" >&5
+echo "$as_me:3495: result: $with_trace" >&5
 echo "${ECHO_T}$with_trace" >&6
 test $with_trace = no &&
 cat >>confdefs.h <<\EOF
 #define NO_LYNX_TRACE 1
 EOF
 
-echo "$as_me:3470: checking if you want verbose trace code" >&5
+echo "$as_me:3502: checking if you want verbose trace code" >&5
 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
@@ -3484,7 +3516,7 @@ else
 	with_vertrace=no
 
 fi;
-echo "$as_me:3487: result: $with_vertrace" >&5
+echo "$as_me:3519: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test $with_vertrace = yes &&
 cat >>confdefs.h <<\EOF
@@ -3493,7 +3525,7 @@ EOF
 
 if test -n "$GCC"
 then
-echo "$as_me:3496: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:3528: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -3510,7 +3542,7 @@ else
 	with_warnings=no
 
 fi;
-echo "$as_me:3513: result: $with_warnings" >&5
+echo "$as_me:3545: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -3533,10 +3565,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3536: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3568: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 3539 "${as_me:-configure}"
+#line 3571 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -3585,12 +3617,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3588: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3591: \$? = $ac_status" >&5
+  echo "$as_me:3623: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3593: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3625: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in
@@ -3654,16 +3686,16 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	(linux*|gnu*)
-		echo "$as_me:3657: checking if this is really Intel C compiler" >&5
+		echo "$as_me:3689: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3662 "configure"
+#line 3694 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
 #ifdef __INTEL_COMPILER
@@ -3676,16 +3708,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3682: \$? = $ac_status" >&5
+  echo "$as_me:3714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3688: \$? = $ac_status" >&5
+  echo "$as_me:3720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -3696,7 +3728,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3699: result: $INTEL_COMPILER" >&5
+		echo "$as_me:3731: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -3705,16 +3737,16 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:3708: checking if this is really Clang C compiler" >&5
+	echo "$as_me:3740: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
 	cf_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -Qunused-arguments"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3713 "configure"
+#line 3745 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
 #ifdef __clang__
@@ -3727,16 +3759,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3733: \$? = $ac_status" >&5
+  echo "$as_me:3765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3739: \$? = $ac_status" >&5
+  echo "$as_me:3771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
@@ -3747,12 +3779,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:3750: result: $CLANG_COMPILER" >&5
+	echo "$as_me:3782: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3755 "${as_me:-configure}"
+#line 3787 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3769,7 +3801,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:3772: checking for $CC warning options..." >&5
+	{ echo "$as_me:3804: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -3785,12 +3817,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3788: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3791: \$? = $ac_status" >&5
+  echo "$as_me:3823: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3793: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3825: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -3799,7 +3831,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3802: checking for $CC warning options..." >&5
+	{ echo "$as_me:3834: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -3823,12 +3855,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3826: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3829: \$? = $ac_status" >&5
+  echo "$as_me:3861: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3831: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3863: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in
 			(Wcast-qual)
@@ -3839,7 +3871,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3842: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3874: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3849,7 +3881,7 @@ echo "${as_me:-configure}:3842: testing feature is broken in gcc $GCC_VERSION ..
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3852: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3884: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3865,7 +3897,7 @@ rm -rf conftest*
 fi
 fi
 
-echo "$as_me:3868: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:3900: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -3882,7 +3914,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:3885: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:3917: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -3996,23 +4028,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:3999: checking for dbmalloc.h" >&5
+	echo "$as_me:4031: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4005 "configure"
+#line 4037 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:4009: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4041: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4015: \$? = $ac_status" >&5
+  echo "$as_me:4047: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4031,11 +4063,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4034: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:4066: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test $ac_cv_header_dbmalloc_h = yes; then
 
-echo "$as_me:4038: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:4070: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4043,7 +4075,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4046 "configure"
+#line 4078 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4054,7 +4086,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char debug_malloc ();
 int
-main ()
+main (void)
 {
 debug_malloc ();
   ;
@@ -4062,16 +4094,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4068: \$? = $ac_status" >&5
+  echo "$as_me:4100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4074: \$? = $ac_status" >&5
+  echo "$as_me:4106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -4082,7 +4114,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4085: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:4117: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
   cat >>confdefs.h <<EOF
@@ -4097,7 +4129,7 @@ fi
 
 fi
 
-echo "$as_me:4100: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:4132: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -4114,7 +4146,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:4117: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:4149: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -4228,23 +4260,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:4231: checking for dmalloc.h" >&5
+	echo "$as_me:4263: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4237 "configure"
+#line 4269 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:4241: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4273: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4247: \$? = $ac_status" >&5
+  echo "$as_me:4279: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4263,11 +4295,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4266: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:4298: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test $ac_cv_header_dmalloc_h = yes; then
 
-echo "$as_me:4270: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:4302: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4275,7 +4307,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4278 "configure"
+#line 4310 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4286,7 +4318,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char dmalloc_debug ();
 int
-main ()
+main (void)
 {
 dmalloc_debug ();
   ;
@@ -4294,16 +4326,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4300: \$? = $ac_status" >&5
+  echo "$as_me:4332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4306: \$? = $ac_status" >&5
+  echo "$as_me:4338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -4314,7 +4346,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4317: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:4349: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
   cat >>confdefs.h <<EOF
@@ -4354,7 +4386,7 @@ case $host_os in
 	# contributed by Alex Matulich (matuli_a at marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:4357: checking for strcmp in -lc_s" >&5
+echo "$as_me:4389: checking for strcmp in -lc_s" >&5
 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4362,7 +4394,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4365 "configure"
+#line 4397 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4373,7 +4405,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char strcmp ();
 int
-main ()
+main (void)
 {
 strcmp ();
   ;
@@ -4381,16 +4413,16 @@ strcmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4387: \$? = $ac_status" >&5
+  echo "$as_me:4419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4393: \$? = $ac_status" >&5
+  echo "$as_me:4425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -4401,7 +4433,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4404: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:4436: result: $ac_cv_lib_c_s_strcmp" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6
 if test $ac_cv_lib_c_s_strcmp = yes; then
   cat >>confdefs.h <<EOF
@@ -4583,14 +4615,14 @@ fi
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in
 	(cc|*/cc)
-		{ echo "$as_me:4586: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:4618: WARNING: You should consider using gcc or rcc if available" >&5
 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;}
 		unset ac_cv_prog_CC
 		for ac_prog in gcc rcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:4593: checking for $ac_word" >&5
+echo "$as_me:4625: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4605,7 +4637,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_prog"
-echo "$as_me:4608: found $ac_dir/$ac_word" >&5
+echo "$as_me:4640: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4613,10 +4645,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:4616: result: $CC" >&5
+  echo "$as_me:4648: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:4619: result: no" >&5
+  echo "$as_me:4651: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4639,23 +4671,23 @@ test -n "$CC" || CC="$CC"
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4642: checking for $ac_header" >&5
+echo "$as_me:4674: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4648 "configure"
+#line 4680 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4652: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4684: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4658: \$? = $ac_status" >&5
+  echo "$as_me:4690: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4674,7 +4706,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4677: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4709: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4702,23 +4734,23 @@ done
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4705: checking for $ac_header" >&5
+echo "$as_me:4737: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4711 "configure"
+#line 4743 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4715: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4747: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4721: \$? = $ac_status" >&5
+  echo "$as_me:4753: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4737,7 +4769,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4740: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4772: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4764,13 +4796,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
-echo "$as_me:4767: checking \$CC variable" >&5
+echo "$as_me:4799: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:4771: result: broken" >&5
+	echo "$as_me:4803: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:4773: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:4805: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
@@ -4887,24 +4919,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:4890: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:4922: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:4894: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:4926: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:4898: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:4930: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:4902: result: ok" >&5
+	echo "$as_me:4934: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:4907: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:4939: checking for ${CC:-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5028,7 +5060,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 5031 "configure"
+#line 5063 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -5038,7 +5070,7 @@ choke me
 #endif
 
 int
-main ()
+main (void)
 {
 
 	int test (int i, double x);
@@ -5049,16 +5081,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5055: \$? = $ac_status" >&5
+  echo "$as_me:5087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5061: \$? = $ac_status" >&5
+  echo "$as_me:5093: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -5071,7 +5103,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:5074: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:5106: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -5185,7 +5217,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:5188: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:5220: error: Your compiler does not appear to recognize prototypes.
 You have the following choices:
 	a. adjust your compiler options
 	b. get an up-to-date compiler
@@ -5205,7 +5237,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:5208: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:5240: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5217,7 +5249,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 5220 "configure"
+#line 5252 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5229,7 +5261,7 @@ else
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
@@ -5237,16 +5269,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5243: \$? = $ac_status" >&5
+  echo "$as_me:5275: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5249: \$? = $ac_status" >&5
+  echo "$as_me:5281: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5256,16 +5288,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5262: \$? = $ac_status" >&5
+  echo "$as_me:5294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5268: \$? = $ac_status" >&5
+  echo "$as_me:5300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -5279,13 +5311,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:5282: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:5314: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:5288: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:5320: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5293,7 +5325,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5296 "configure"
+#line 5328 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5305,7 +5337,7 @@ else
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
@@ -5313,16 +5345,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5316: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5319: \$? = $ac_status" >&5
+  echo "$as_me:5351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5325: \$? = $ac_status" >&5
+  echo "$as_me:5357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5331,7 +5363,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5334 "configure"
+#line 5366 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -5344,7 +5376,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
@@ -5352,16 +5384,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5358: \$? = $ac_status" >&5
+  echo "$as_me:5390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5364: \$? = $ac_status" >&5
+  echo "$as_me:5396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -5372,7 +5404,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5375: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:5407: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -5382,7 +5414,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:5385: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:5417: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5390,7 +5422,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5393 "configure"
+#line 5425 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5402,7 +5434,7 @@ else
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
@@ -5410,16 +5442,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5413: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5445: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5416: \$? = $ac_status" >&5
+  echo "$as_me:5448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5422: \$? = $ac_status" >&5
+  echo "$as_me:5454: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5428,7 +5460,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5431 "configure"
+#line 5463 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -5441,7 +5473,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
@@ -5449,16 +5481,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5455: \$? = $ac_status" >&5
+  echo "$as_me:5487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5461: \$? = $ac_status" >&5
+  echo "$as_me:5493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -5469,7 +5501,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5472: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:5504: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -5482,7 +5514,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:5485: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:5517: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5490,11 +5522,11 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5493 "configure"
+#line 5525 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 return !fseeko;
   ;
@@ -5502,16 +5534,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5505: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5508: \$? = $ac_status" >&5
+  echo "$as_me:5540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5514: \$? = $ac_status" >&5
+  echo "$as_me:5546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5520,12 +5552,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5523 "configure"
+#line 5555 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 return !fseeko;
   ;
@@ -5533,16 +5565,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5539: \$? = $ac_status" >&5
+  echo "$as_me:5571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5545: \$? = $ac_status" >&5
+  echo "$as_me:5577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -5553,7 +5585,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5556: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:5588: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -5567,17 +5599,17 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:5570: checking for fseeko" >&5
+echo "$as_me:5602: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5576 "configure"
+#line 5608 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 return fseeko && fseeko (stdin, 0, 0);
   ;
@@ -5585,16 +5617,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5620: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5591: \$? = $ac_status" >&5
+  echo "$as_me:5623: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5597: \$? = $ac_status" >&5
+  echo "$as_me:5629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -5604,7 +5636,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5607: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:5639: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -5625,14 +5657,14 @@ fi
 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
-	echo "$as_me:5628: checking whether to use struct dirent64" >&5
+	echo "$as_me:5660: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5635 "configure"
+#line 5667 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -5640,7 +5672,7 @@ else
 #include <dirent.h>
 
 int
-main ()
+main (void)
 {
 
 		/* if transitional largefile support is setup, this is true */
@@ -5654,16 +5686,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5689: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5660: \$? = $ac_status" >&5
+  echo "$as_me:5692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5666: \$? = $ac_status" >&5
+  echo "$as_me:5698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -5674,7 +5706,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5677: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:5709: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -5686,20 +5718,20 @@ EOF
 if test -z "$ALL_LINGUAS" ; then
 	ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
-	echo "$as_me:5689: checking for PATH separator" >&5
+	echo "$as_me:5721: checking for PATH separator" >&5
 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
 	case $cf_cv_system_name in
 	(os2*)	PATH_SEPARATOR=';'  ;;
 	(*)	${PATH_SEPARATOR:=':'}  ;;
 	esac
 
-	echo "$as_me:5696: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5728: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # Extract the first word of "msginit", so it can be a program name with args.
 
 set dummy msginit; ac_word=$2
-echo "$as_me:5702: checking for $ac_word" >&5
+echo "$as_me:5734: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGINIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5726,17 +5758,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:5729: result: $MSGINIT" >&5
+  echo "$as_me:5761: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:5732: result: no" >&5
+  echo "$as_me:5764: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$MSGINIT" != ":" ; then
 		test -n "$verbose" && echo "	adding en.po" 1>&6
 
-echo "${as_me:-configure}:5739: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:5771: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -5745,7 +5777,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:5748: checking for $ac_word" >&5
+echo "$as_me:5780: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5760,7 +5792,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:5763: found $ac_dir/$ac_word" >&5
+echo "$as_me:5795: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5768,10 +5800,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5771: result: $RANLIB" >&5
+  echo "$as_me:5803: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5774: result: no" >&5
+  echo "$as_me:5806: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5780,7 +5812,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:5783: checking for $ac_word" >&5
+echo "$as_me:5815: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5795,7 +5827,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:5798: found $ac_dir/$ac_word" >&5
+echo "$as_me:5830: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5804,10 +5836,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5807: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5839: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5810: result: no" >&5
+  echo "$as_me:5842: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5816,13 +5848,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:5819: checking for ANSI C header files" >&5
+echo "$as_me:5851: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5825 "configure"
+#line 5857 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5830,13 +5862,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5833: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5865: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5839: \$? = $ac_status" >&5
+  echo "$as_me:5871: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5858,7 +5890,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5861 "configure"
+#line 5893 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5876,7 +5908,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5879 "configure"
+#line 5911 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5897,7 +5929,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5900 "configure"
+#line 5932 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5912,7 +5944,7 @@ else
 
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
-main ()
+main (void)
 {
   int i;
   for (i = 0; i < 256; i++)
@@ -5923,15 +5955,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5929: \$? = $ac_status" >&5
+  echo "$as_me:5961: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5934: \$? = $ac_status" >&5
+  echo "$as_me:5966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5944,7 +5976,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5947: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5979: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5954,7 +5986,7 @@ EOF
 
 fi
 
-echo "$as_me:5957: checking for inline" >&5
+echo "$as_me:5989: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5962,7 +5994,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 5965 "configure"
+#line 5997 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -5971,16 +6003,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5977: \$? = $ac_status" >&5
+  echo "$as_me:6009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5983: \$? = $ac_status" >&5
+  echo "$as_me:6015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5991,7 +6023,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:5994: result: $ac_cv_c_inline" >&5
+echo "$as_me:6026: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -6012,28 +6044,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6015: checking for $ac_header" >&5
+echo "$as_me:6047: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6021 "configure"
+#line 6053 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6030: \$? = $ac_status" >&5
+  echo "$as_me:6062: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6036: \$? = $ac_status" >&5
+  echo "$as_me:6068: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6043,7 +6075,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6046: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6078: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6053,17 +6085,17 @@ EOF
 fi
 done
 
-echo "$as_me:6056: checking for off_t" >&5
+echo "$as_me:6088: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6062 "configure"
+#line 6094 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((off_t *) 0)
   return 0;
@@ -6074,16 +6106,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6080: \$? = $ac_status" >&5
+  echo "$as_me:6112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6086: \$? = $ac_status" >&5
+  echo "$as_me:6118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -6093,7 +6125,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6096: result: $ac_cv_type_off_t" >&5
+echo "$as_me:6128: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -6105,17 +6137,17 @@ EOF
 
 fi
 
-echo "$as_me:6108: checking for size_t" >&5
+echo "$as_me:6140: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6114 "configure"
+#line 6146 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((size_t *) 0)
   return 0;
@@ -6126,16 +6158,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6132: \$? = $ac_status" >&5
+  echo "$as_me:6164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6138: \$? = $ac_status" >&5
+  echo "$as_me:6170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -6145,7 +6177,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6148: result: $ac_cv_type_size_t" >&5
+echo "$as_me:6180: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -6159,17 +6191,17 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:6162: checking for working alloca.h" >&5
+echo "$as_me:6194: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6168 "configure"
+#line 6200 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (2 * sizeof (int));
   ;
@@ -6177,16 +6209,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6183: \$? = $ac_status" >&5
+  echo "$as_me:6215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6189: \$? = $ac_status" >&5
+  echo "$as_me:6221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -6196,7 +6228,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6199: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:6231: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -6206,13 +6238,13 @@ EOF
 
 fi
 
-echo "$as_me:6209: checking for alloca" >&5
+echo "$as_me:6241: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6215 "configure"
+#line 6247 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -6236,7 +6268,7 @@ char *alloca ();
 #endif
 
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (1);
   ;
@@ -6244,16 +6276,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6250: \$? = $ac_status" >&5
+  echo "$as_me:6282: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6256: \$? = $ac_status" >&5
+  echo "$as_me:6288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -6263,7 +6295,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6266: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:6298: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -6284,13 +6316,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:6287: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:6319: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6293 "configure"
+#line 6325 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6308,18 +6340,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6311: result: $ac_cv_os_cray" >&5
+echo "$as_me:6343: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6316: checking for $ac_func" >&5
+echo "$as_me:6348: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6322 "configure"
+#line 6354 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6334,7 +6366,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -6350,16 +6382,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6356: \$? = $ac_status" >&5
+  echo "$as_me:6388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6362: \$? = $ac_status" >&5
+  echo "$as_me:6394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6369,7 +6401,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6372: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6404: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -6383,7 +6415,7 @@ fi
   done
 fi
 
-echo "$as_me:6386: checking stack direction for C alloca" >&5
+echo "$as_me:6418: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6392,10 +6424,10 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6395 "configure"
+#line 6427 "configure"
 #include "confdefs.h"
 int
-find_stack_direction ()
+find_stack_direction (void)
 {
   static char *addr = 0;
   auto char dummy;
@@ -6409,21 +6441,21 @@ find_stack_direction ()
 }
 
 int
-main ()
+main (void)
 {
   $ac_main_return (find_stack_direction () < 0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6421: \$? = $ac_status" >&5
+  echo "$as_me:6453: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6426: \$? = $ac_status" >&5
+  echo "$as_me:6458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -6435,7 +6467,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6438: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:6470: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -6447,23 +6479,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6450: checking for $ac_header" >&5
+echo "$as_me:6482: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6456 "configure"
+#line 6488 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6460: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6492: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6466: \$? = $ac_status" >&5
+  echo "$as_me:6498: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6482,7 +6514,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6485: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6517: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6495,13 +6527,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6498: checking for $ac_func" >&5
+echo "$as_me:6530: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6504 "configure"
+#line 6536 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6516,7 +6548,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -6532,16 +6564,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6538: \$? = $ac_status" >&5
+  echo "$as_me:6570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6544: \$? = $ac_status" >&5
+  echo "$as_me:6576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6551,7 +6583,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6554: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6586: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6561,7 +6593,7 @@ EOF
 fi
 done
 
-echo "$as_me:6564: checking for working mmap" >&5
+echo "$as_me:6596: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6570,7 +6602,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6573 "configure"
+#line 6605 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6640,7 +6672,7 @@ char *malloc ();
 #endif /* no HAVE_GETPAGESIZE */
 
 int
-main ()
+main (void)
 {
   char *data, *data2, *data3;
   int i, pagesize;
@@ -6697,15 +6729,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6703: \$? = $ac_status" >&5
+  echo "$as_me:6735: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6708: \$? = $ac_status" >&5
+  echo "$as_me:6740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6717,7 +6749,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6720: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:6752: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -6728,13 +6760,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:6731: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:6763: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6737 "configure"
+#line 6769 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -6754,7 +6786,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6757: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:6789: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
 	GLIBC21="$ac_cv_gnu_library_2_1"
@@ -6767,7 +6799,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec
 : ${CONFIG_H:=config.h}
 
 if test -z "$PACKAGE" ; then
-	{ { echo "$as_me:6770: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:6802: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
 echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6784,23 +6816,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6787: checking for $ac_header" >&5
+echo "$as_me:6819: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6793 "configure"
+#line 6825 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6797: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6829: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6803: \$? = $ac_status" >&5
+  echo "$as_me:6835: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6819,7 +6851,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6822: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6854: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6834,13 +6866,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6837: checking for $ac_func" >&5
+echo "$as_me:6869: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6843 "configure"
+#line 6875 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6855,7 +6887,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -6871,16 +6903,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6877: \$? = $ac_status" >&5
+  echo "$as_me:6909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6883: \$? = $ac_status" >&5
+  echo "$as_me:6915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6890,7 +6922,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6893: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6925: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6938,11 +6970,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6941 "configure"
+#line 6973 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -6950,16 +6982,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6956: \$? = $ac_status" >&5
+  echo "$as_me:6988: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6962: \$? = $ac_status" >&5
+  echo "$as_me:6994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6976,7 +7008,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:6979: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7011: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7019,11 +7051,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7022 "configure"
+#line 7054 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -7031,16 +7063,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7037: \$? = $ac_status" >&5
+  echo "$as_me:7069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7043: \$? = $ac_status" >&5
+  echo "$as_me:7075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7057,7 +7089,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7060: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7092: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7075,7 +7107,7 @@ echo "${as_me:-configure}:7060: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:7078: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:7110: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -7100,7 +7132,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7103: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7135: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7129,7 +7161,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7132: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7164: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7138,7 +7170,7 @@ echo "${as_me:-configure}:7132: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:7141: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:7173: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -7149,7 +7181,7 @@ esac
 
 fi;
 
-  echo "$as_me:7152: checking for iconv" >&5
+  echo "$as_me:7184: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7160,19 +7192,19 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:7163: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7195: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7168 "configure"
+#line 7200 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -7184,16 +7216,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7190: \$? = $ac_status" >&5
+  echo "$as_me:7222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7196: \$? = $ac_status" >&5
+  echo "$as_me:7228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7207,14 +7239,14 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7210 "configure"
+#line 7242 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -7226,16 +7258,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7232: \$? = $ac_status" >&5
+  echo "$as_me:7264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7238: \$? = $ac_status" >&5
+  echo "$as_me:7270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7252,9 +7284,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:7255: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:7287: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:7257: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7289: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7345,18 +7377,18 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_iconv ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:7348: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7380: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 7352 "configure"
+#line 7384 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -7368,21 +7400,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7374: \$? = $ac_status" >&5
+  echo "$as_me:7406: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7380: \$? = $ac_status" >&5
+  echo "$as_me:7412: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:7385: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7417: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7400,7 +7432,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:7403: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7435: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7475,20 +7507,20 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_iconv ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me:-configure}:7478: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7510: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-liconv  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 7484 "configure"
+#line 7516 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -7500,21 +7532,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7506: \$? = $ac_status" >&5
+  echo "$as_me:7538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7512: \$? = $ac_status" >&5
+  echo "$as_me:7544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me:-configure}:7517: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7549: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -7554,7 +7586,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:7557: result: $am_cv_func_iconv" >&5
+echo "$as_me:7589: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -7563,14 +7595,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:7566: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:7598: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 7573 "configure"
+#line 7605 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7587,7 +7619,7 @@ size_t iconv();
 #endif
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -7595,16 +7627,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7598: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7601: \$? = $ac_status" >&5
+  echo "$as_me:7633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7607: \$? = $ac_status" >&5
+  echo "$as_me:7639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -7614,7 +7646,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7617: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:7649: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -7656,11 +7688,11 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7659 "configure"
+#line 7691 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -7668,16 +7700,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7671: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7674: \$? = $ac_status" >&5
+  echo "$as_me:7706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7680: \$? = $ac_status" >&5
+  echo "$as_me:7712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7694,7 +7726,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:7697: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7729: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7733,7 +7765,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:7736: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7768: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7744,17 +7776,17 @@ fi
     fi
   fi
 
-echo "$as_me:7747: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:7779: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7753 "configure"
+#line 7785 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
-main ()
+main (void)
 {
 char* cs = nl_langinfo(CODESET);
   ;
@@ -7762,16 +7794,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7768: \$? = $ac_status" >&5
+  echo "$as_me:7800: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7774: \$? = $ac_status" >&5
+  echo "$as_me:7806: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -7782,7 +7814,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7785: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:7817: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test $am_cv_langinfo_codeset = yes; then
 
@@ -7793,17 +7825,17 @@ EOF
 	fi
 
    if test $ac_cv_header_locale_h = yes; then
-	echo "$as_me:7796: checking for LC_MESSAGES" >&5
+	echo "$as_me:7828: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7802 "configure"
+#line 7834 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
-main ()
+main (void)
 {
 return LC_MESSAGES
   ;
@@ -7811,16 +7843,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7817: \$? = $ac_status" >&5
+  echo "$as_me:7849: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7823: \$? = $ac_status" >&5
+  echo "$as_me:7855: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -7830,7 +7862,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7833: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:7865: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
 	if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -7840,7 +7872,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:7843: checking whether NLS is requested" >&5
+   echo "$as_me:7875: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
 
 # Check whether --enable-nls or --disable-nls was given.
@@ -7850,7 +7882,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:7853: result: $USE_NLS" >&5
+  echo "$as_me:7885: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -7863,7 +7895,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:7866: checking whether included gettext is requested" >&5
+    echo "$as_me:7898: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -7873,7 +7905,7 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7876: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:7908: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
     nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -7898,7 +7930,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-      echo "$as_me:7901: checking for libintl.h and gettext()" >&5
+      echo "$as_me:7933: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
 if test "${cf_cv_func_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7909,19 +7941,19 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:7912: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7944: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7917 "configure"
+#line 7949 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 
 int
-main ()
+main (void)
 {
 
 	bindtextdomain ("", "");
@@ -7934,16 +7966,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7940: \$? = $ac_status" >&5
+  echo "$as_me:7972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7946: \$? = $ac_status" >&5
+  echo "$as_me:7978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7957,14 +7989,14 @@ cat conftest.$ac_ext >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7960 "configure"
+#line 7992 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 
 int
-main ()
+main (void)
 {
 
 	bindtextdomain ("", "");
@@ -7977,16 +8009,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7983: \$? = $ac_status" >&5
+  echo "$as_me:8015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7989: \$? = $ac_status" >&5
+  echo "$as_me:8021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -8003,9 +8035,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:8006: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:8038: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:8008: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8040: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8096,18 +8128,18 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_intl ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me:-configure}:8099: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8131: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 8103 "configure"
+#line 8135 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 
 int
-main ()
+main (void)
 {
 
 	bindtextdomain ("", "");
@@ -8120,21 +8152,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8126: \$? = $ac_status" >&5
+  echo "$as_me:8158: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8132: \$? = $ac_status" >&5
+  echo "$as_me:8164: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me:-configure}:8137: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8169: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8152,7 +8184,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:8155: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8187: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8227,20 +8259,20 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_intl ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me:-configure}:8230: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8262: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lintl  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 8236 "configure"
+#line 8268 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
 
 int
-main ()
+main (void)
 {
 
 	bindtextdomain ("", "");
@@ -8253,21 +8285,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8259: \$? = $ac_status" >&5
+  echo "$as_me:8291: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8265: \$? = $ac_status" >&5
+  echo "$as_me:8297: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me:-configure}:8270: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8302: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -8307,7 +8339,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:8310: result: $cf_cv_func_gettext" >&5
+echo "$as_me:8342: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
       LIBS="$cf_save_LIBS_1"
 
@@ -8347,11 +8379,11 @@ if test -n "$cf_cv_header_path_intl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8350 "configure"
+#line 8382 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -8359,16 +8391,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8365: \$? = $ac_status" >&5
+  echo "$as_me:8397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8371: \$? = $ac_status" >&5
+  echo "$as_me:8403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8385,7 +8417,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:8388: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8420: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8424,7 +8456,7 @@ if test -n "$cf_cv_library_path_intl" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8427: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8459: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -8440,13 +8472,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8443: checking for $ac_func" >&5
+echo "$as_me:8475: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8449 "configure"
+#line 8481 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8461,7 +8493,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -8477,16 +8509,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8483: \$? = $ac_status" >&5
+  echo "$as_me:8515: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8489: \$? = $ac_status" >&5
+  echo "$as_me:8521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8496,7 +8528,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8499: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8531: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8511,7 +8543,7 @@ done
                     # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:8514: checking for $ac_word" >&5
+echo "$as_me:8546: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8538,16 +8570,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8541: result: $MSGFMT" >&5
+  echo "$as_me:8573: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8544: result: no" >&5
+  echo "$as_me:8576: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
           # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:8550: checking for $ac_word" >&5
+echo "$as_me:8582: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8564,7 +8596,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:8567: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8599: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8576,17 +8608,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8579: result: $GMSGFMT" >&5
+  echo "$as_me:8611: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8582: result: no" >&5
+  echo "$as_me:8614: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
                     # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:8589: checking for $ac_word" >&5
+echo "$as_me:8621: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8613,10 +8645,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8616: result: $XGETTEXT" >&5
+  echo "$as_me:8648: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8619: result: no" >&5
+  echo "$as_me:8651: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8631,7 +8663,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:8634: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:8666: error: no NLS library is packaged with this application" >&5
 echo "$as_me: error: no NLS library is packaged with this application" >&2;}
    { (exit 1); exit 1; }; }
       fi
@@ -8639,7 +8671,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;}
       # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:8642: checking for $ac_word" >&5
+echo "$as_me:8674: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8666,16 +8698,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8669: result: $MSGFMT" >&5
+  echo "$as_me:8701: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8672: result: no" >&5
+  echo "$as_me:8704: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:8678: checking for $ac_word" >&5
+echo "$as_me:8710: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8692,7 +8724,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:8695: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8727: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8704,17 +8736,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8707: result: $GMSGFMT" >&5
+  echo "$as_me:8739: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8710: result: no" >&5
+  echo "$as_me:8742: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:8717: checking for $ac_word" >&5
+echo "$as_me:8749: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8741,10 +8773,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8744: result: $XGETTEXT" >&5
+  echo "$as_me:8776: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8747: result: no" >&5
+  echo "$as_me:8779: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8759,7 +8791,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8762: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:8794: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
         GMSGFMT=":"
       fi
@@ -8769,7 +8801,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
                       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8772: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:8804: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
         XGETTEXT=":"
       fi
@@ -8789,7 +8821,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8792: checking for $ac_word" >&5
+echo "$as_me:8824: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8804,7 +8836,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:8807: found $ac_dir/$ac_word" >&5
+echo "$as_me:8839: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8812,10 +8844,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:8815: result: $INTLBISON" >&5
+  echo "$as_me:8847: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:8818: result: no" >&5
+  echo "$as_me:8850: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8825,7 +8857,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:8828: checking version of bison" >&5
+            echo "$as_me:8860: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
@@ -8834,7 +8866,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac
-    echo "$as_me:8837: result: $ac_prog_version" >&5
+    echo "$as_me:8869: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -8860,7 +8892,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:8863: checking for catalogs to be installed" >&5
+       echo "$as_me:8895: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -8880,7 +8912,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:8883: result: $LINGUAS" >&5
+       echo "$as_me:8915: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8916,7 +8948,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8919: checking if we should use included message-library" >&5
+echo "$as_me:8951: checking if we should use included message-library" >&5
 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
 
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -8927,7 +8959,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8930: result: $use_our_messages" >&5
+echo "$as_me:8962: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -8969,23 +9001,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8972: checking for $ac_header" >&5
+echo "$as_me:9004: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8978 "configure"
+#line 9010 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8982: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9014: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8988: \$? = $ac_status" >&5
+  echo "$as_me:9020: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9004,7 +9036,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9007: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9039: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9090,7 +9122,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9093: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9125: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9099,7 +9131,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:9102: checking if you want full utility pathnames" >&5
+echo "$as_me:9134: checking if you want full utility pathnames" >&5
 echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
@@ -9116,14 +9148,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:9119: result: $with_full_paths" >&5
+echo "$as_me:9151: result: $with_full_paths" >&5
 echo "${ECHO_T}$with_full_paths" >&6
 test $with_full_paths = no &&
 cat >>confdefs.h <<\EOF
 #define USE_EXECVP 1
 EOF
 
-echo "$as_me:9126: checking for system mailer" >&5
+echo "$as_me:9158: checking for system mailer" >&5
 echo $ECHO_N "checking for system mailer... $ECHO_C" >&6
 if test "${cf_cv_SYSTEM_MAIL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9143,14 +9175,14 @@ else
 
 fi
 
-echo "$as_me:9146: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:9178: result: $cf_cv_SYSTEM_MAIL" >&5
 echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6
 
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL"
 EOF
 
-echo "$as_me:9153: checking system mail flags" >&5
+echo "$as_me:9185: checking system mail flags" >&5
 echo $ECHO_N "checking system mail flags... $ECHO_C" >&6
 if test "${cf_cv_system_mail_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9166,7 +9198,7 @@ else
 
 fi
 
-echo "$as_me:9169: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:9201: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -9217,18 +9249,18 @@ case $host_os in
 	;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
-echo "$as_me:9220: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9252: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9227 "configure"
+#line 9259 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifndef _XOPEN_SOURCE
@@ -9239,16 +9271,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9245: \$? = $ac_status" >&5
+  echo "$as_me:9277: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9251: \$? = $ac_status" >&5
+  echo "$as_me:9283: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9257,11 +9289,11 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9260 "configure"
+#line 9292 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifdef _XOPEN_SOURCE
@@ -9272,16 +9304,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9278: \$? = $ac_status" >&5
+  echo "$as_me:9310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9284: \$? = $ac_status" >&5
+  echo "$as_me:9316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9296,12 +9328,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9299: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9331: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
 if test "$cf_cv_gnu_source" = yes
 then
-echo "$as_me:9304: checking if we should also define _DEFAULT_SOURCE" >&5
+echo "$as_me:9336: checking if we should also define _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9309,11 +9341,11 @@ else
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9312 "configure"
+#line 9344 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifdef _DEFAULT_SOURCE
@@ -9324,16 +9356,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9330: \$? = $ac_status" >&5
+  echo "$as_me:9362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9336: \$? = $ac_status" >&5
+  echo "$as_me:9368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else
@@ -9344,7 +9376,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9347: result: $cf_cv_default_source" >&5
+echo "$as_me:9379: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi
@@ -9370,20 +9402,20 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:9373: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9405: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:9379: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9411: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9382 "configure"
+#line 9414 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
@@ -9394,16 +9426,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9400: \$? = $ac_status" >&5
+  echo "$as_me:9432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9406: \$? = $ac_status" >&5
+  echo "$as_me:9438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9424,11 +9456,11 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9427 "configure"
+#line 9459 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifdef _POSIX_SOURCE
@@ -9439,16 +9471,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9474: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9445: \$? = $ac_status" >&5
+  echo "$as_me:9477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9451: \$? = $ac_status" >&5
+  echo "$as_me:9483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9459,19 +9491,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9462: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9494: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:9467: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9499: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9470 "configure"
+#line 9502 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
@@ -9482,16 +9514,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9517: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9488: \$? = $ac_status" >&5
+  echo "$as_me:9520: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9494: \$? = $ac_status" >&5
+  echo "$as_me:9526: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9507,7 +9539,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9510: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9542: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -9645,14 +9677,14 @@ fi
 	;;
 (*)
 
-echo "$as_me:9648: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9680: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9655 "configure"
+#line 9687 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9660,7 +9692,7 @@ else
 #include <sys/types.h>
 
 int
-main ()
+main (void)
 {
 
 #ifndef _XOPEN_SOURCE
@@ -9671,16 +9703,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9674: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9677: \$? = $ac_status" >&5
+  echo "$as_me:9709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9683: \$? = $ac_status" >&5
+  echo "$as_me:9715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9689,7 +9721,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9692 "configure"
+#line 9724 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9697,7 +9729,7 @@ cf_save="$CPPFLAGS"
 #include <sys/types.h>
 
 int
-main ()
+main (void)
 {
 
 #ifdef _XOPEN_SOURCE
@@ -9708,16 +9740,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9714: \$? = $ac_status" >&5
+  echo "$as_me:9746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9720: \$? = $ac_status" >&5
+  echo "$as_me:9752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9732,7 +9764,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9735: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9767: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9860,20 +9892,20 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:9863: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9895: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:9869: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9901: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9872 "configure"
+#line 9904 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
@@ -9884,16 +9916,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9890: \$? = $ac_status" >&5
+  echo "$as_me:9922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9896: \$? = $ac_status" >&5
+  echo "$as_me:9928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9914,11 +9946,11 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9917 "configure"
+#line 9949 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifdef _POSIX_SOURCE
@@ -9929,16 +9961,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9935: \$? = $ac_status" >&5
+  echo "$as_me:9967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9941: \$? = $ac_status" >&5
+  echo "$as_me:9973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9949,19 +9981,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9952: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9984: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:9957: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9989: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9960 "configure"
+#line 9992 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
-main ()
+main (void)
 {
 
 #ifndef _POSIX_C_SOURCE
@@ -9972,16 +10004,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9978: \$? = $ac_status" >&5
+  echo "$as_me:10010: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9984: \$? = $ac_status" >&5
+  echo "$as_me:10016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9997,7 +10029,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10000: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10032: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -10189,7 +10221,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:10192: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10224: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -10199,7 +10231,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:10202: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10234: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -10209,7 +10241,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:10212: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10244: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -10219,14 +10251,14 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:10222: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:10254: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10225 "configure"
+#line 10257 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
-main ()
+main (void)
 {
 
 #ifndef _XOPEN_SOURCE
@@ -10237,16 +10269,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10243: \$? = $ac_status" >&5
+  echo "$as_me:10275: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10249: \$? = $ac_status" >&5
+  echo "$as_me:10281: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -10255,16 +10287,16 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:10258: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:10290: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test $cf_XOPEN_SOURCE_set = yes
 	then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10263 "configure"
+#line 10295 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
-main ()
+main (void)
 {
 
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
@@ -10275,16 +10307,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10281: \$? = $ac_status" >&5
+  echo "$as_me:10313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10287: \$? = $ac_status" >&5
+  echo "$as_me:10319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -10295,19 +10327,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:10298: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:10330: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:10303: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10335: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10310 "configure"
+#line 10342 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10315,7 +10347,7 @@ else
 #include <sys/types.h>
 
 int
-main ()
+main (void)
 {
 
 #ifndef _XOPEN_SOURCE
@@ -10326,16 +10358,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10332: \$? = $ac_status" >&5
+  echo "$as_me:10364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10338: \$? = $ac_status" >&5
+  echo "$as_me:10370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10344,7 +10376,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10347 "configure"
+#line 10379 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10352,7 +10384,7 @@ cf_save="$CPPFLAGS"
 #include <sys/types.h>
 
 int
-main ()
+main (void)
 {
 
 #ifdef _XOPEN_SOURCE
@@ -10363,16 +10395,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10369: \$? = $ac_status" >&5
+  echo "$as_me:10401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10375: \$? = $ac_status" >&5
+  echo "$as_me:10407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10387,7 +10419,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10390: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10422: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -10505,21 +10537,21 @@ fi
 	fi
 fi
 
-echo "$as_me:10508: checking if SIGWINCH is defined" >&5
+echo "$as_me:10540: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10515 "configure"
+#line 10547 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/signal.h>
 
 int
-main ()
+main (void)
 {
 int x = SIGWINCH
   ;
@@ -10527,23 +10559,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10533: \$? = $ac_status" >&5
+  echo "$as_me:10565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10539: \$? = $ac_status" >&5
+  echo "$as_me:10571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 10546 "configure"
+#line 10578 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10553,7 +10585,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #include <sys/signal.h>
 
 int
-main ()
+main (void)
 {
 int x = SIGWINCH
   ;
@@ -10561,16 +10593,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10596: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10567: \$? = $ac_status" >&5
+  echo "$as_me:10599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10573: \$? = $ac_status" >&5
+  echo "$as_me:10605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -10584,11 +10616,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10587: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:10619: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:10591: checking for actual SIGWINCH definition" >&5
+echo "$as_me:10623: checking for actual SIGWINCH definition" >&5
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10599,7 +10631,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10602 "configure"
+#line 10634 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10609,7 +10641,7 @@ do
 #include <sys/signal.h>
 
 int
-main ()
+main (void)
 {
 
 #if SIGWINCH != $cf_sigwinch
@@ -10621,16 +10653,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10627: \$? = $ac_status" >&5
+  echo "$as_me:10659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10633: \$? = $ac_status" >&5
+  echo "$as_me:10665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -10644,7 +10676,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:10647: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:10679: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10656,7 +10688,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10659: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10691: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -10741,7 +10773,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:10744: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10776: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -10751,7 +10783,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:10754: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10786: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -10761,7 +10793,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:10764: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10796: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -10770,11 +10802,11 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 10773 "configure"
+#line 10805 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello world");
   ;
@@ -10782,16 +10814,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10788: \$? = $ac_status" >&5
+  echo "$as_me:10820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10794: \$? = $ac_status" >&5
+  echo "$as_me:10826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10799,12 +10831,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10802: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10834: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:10807: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10839: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -10816,7 +10848,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:10819: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:10851: checking if you want NSS compatible SSL libraries" >&5
 echo $ECHO_N "checking if you want NSS compatible SSL libraries... $ECHO_C" >&6
 if test "${cf_cv_use_libnss_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10831,10 +10863,10 @@ else
 fi;
 
 fi
-echo "$as_me:10834: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:10866: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:10837: checking if you want ssl library" >&5
+echo "$as_me:10869: checking if you want ssl library" >&5
 echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6
 if test "${cf_cv_use_libssl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10849,10 +10881,10 @@ else
 fi;
 
 fi
-echo "$as_me:10852: result: $cf_cv_use_libssl" >&5
+echo "$as_me:10884: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:10855: checking if you want gnutls support" >&5
+echo "$as_me:10887: checking if you want gnutls support" >&5
 echo $ECHO_N "checking if you want gnutls support... $ECHO_C" >&6
 if test "${cf_cv_use_libgnutls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10867,11 +10899,11 @@ else
 fi;
 
 fi
-echo "$as_me:10870: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:10902: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
 
 # this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
-echo "$as_me:10874: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:10906: checking if you want gnutls-openssl compat" >&5
 echo $ECHO_N "checking if you want gnutls-openssl compat... $ECHO_C" >&6
 if test "${cf_cv_gnutls_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10886,10 +10918,10 @@ else
 fi;
 
 fi
-echo "$as_me:10889: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:10921: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:10892: checking if you want socks library" >&5
+echo "$as_me:10924: checking if you want socks library" >&5
 echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10904,10 +10936,10 @@ else
 fi;
 
 fi
-echo "$as_me:10907: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:10939: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:10910: checking if you want socks5 library" >&5
+echo "$as_me:10942: checking if you want socks5 library" >&5
 echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10922,7 +10954,7 @@ else
 fi;
 
 fi
-echo "$as_me:10925: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:10957: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -10961,11 +10993,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10964 "configure"
+#line 10996 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -10973,16 +11005,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10979: \$? = $ac_status" >&5
+  echo "$as_me:11011: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10985: \$? = $ac_status" >&5
+  echo "$as_me:11017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10999,7 +11031,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11002: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11034: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11042,11 +11074,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11045 "configure"
+#line 11077 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -11054,16 +11086,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11060: \$? = $ac_status" >&5
+  echo "$as_me:11092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11066: \$? = $ac_status" >&5
+  echo "$as_me:11098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11080,7 +11112,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11083: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11115: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11098,7 +11130,7 @@ echo "${as_me:-configure}:11083: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11101: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:11133: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11123,7 +11155,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11126: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11158: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11152,7 +11184,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11155: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11187: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11161,7 +11193,7 @@ echo "${as_me:-configure}:11155: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11164: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:11196: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11175,18 +11207,18 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:11178: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11210: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11183 "configure"
+#line 11215 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 
       Raccept((char *)0)
@@ -11196,16 +11228,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11202: \$? = $ac_status" >&5
+  echo "$as_me:11234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11208: \$? = $ac_status" >&5
+  echo "$as_me:11240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -11219,13 +11251,13 @@ cat conftest.$ac_ext >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11222 "configure"
+#line 11254 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 
       Raccept((char *)0)
@@ -11235,16 +11267,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11241: \$? = $ac_status" >&5
+  echo "$as_me:11273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11247: \$? = $ac_status" >&5
+  echo "$as_me:11279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -11261,9 +11293,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:11264: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:11296: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:11266: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11298: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11354,17 +11386,17 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_socks ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me:-configure}:11357: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11389: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 11361 "configure"
+#line 11393 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 
       Raccept((char *)0)
@@ -11374,21 +11406,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11380: \$? = $ac_status" >&5
+  echo "$as_me:11412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11386: \$? = $ac_status" >&5
+  echo "$as_me:11418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me:-configure}:11391: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11423: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11406,7 +11438,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:11409: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11441: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -11481,19 +11513,19 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_socks ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me:-configure}:11484: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11516: testing ... testing $cf_cv_library_path_socks ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lsocks  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 11490 "configure"
+#line 11522 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
 
       Raccept((char *)0)
@@ -11503,21 +11535,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11538: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11509: \$? = $ac_status" >&5
+  echo "$as_me:11541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11515: \$? = $ac_status" >&5
+  echo "$as_me:11547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me:-configure}:11520: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11552: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -11576,11 +11608,11 @@ if test -n "$cf_cv_header_path_socks" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11579 "configure"
+#line 11611 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -11588,16 +11620,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11591: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11594: \$? = $ac_status" >&5
+  echo "$as_me:11626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11600: \$? = $ac_status" >&5
+  echo "$as_me:11632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11614,7 +11646,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11617: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11649: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11650,7 +11682,7 @@ if test -n "$cf_cv_library_path_socks" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11653: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11685: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11675,7 +11707,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:11678: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:11710: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -11718,7 +11750,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:11721: error: cannot link with socks library" >&5
+    { { echo "$as_me:11753: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11759,11 +11791,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11762 "configure"
+#line 11794 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -11771,16 +11803,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11777: \$? = $ac_status" >&5
+  echo "$as_me:11809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11783: \$? = $ac_status" >&5
+  echo "$as_me:11815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11797,7 +11829,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11800: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11832: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11840,11 +11872,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11843 "configure"
+#line 11875 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -11852,16 +11884,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11858: \$? = $ac_status" >&5
+  echo "$as_me:11890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11864: \$? = $ac_status" >&5
+  echo "$as_me:11896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11878,7 +11910,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:11881: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11913: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11896,7 +11928,7 @@ echo "${as_me:-configure}:11881: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11899: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11931: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11921,7 +11953,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11924: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11956: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11950,7 +11982,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11953: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11985: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11959,7 +11991,7 @@ echo "${as_me:-configure}:11953: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11962: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11994: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11992,16 +12024,16 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:11995: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:12027: checking if the socks library uses socks4 prefix" >&5
 echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6
 cf_use_socks4=error
 cat >conftest.$ac_ext <<_ACEOF
-#line 11999 "configure"
+#line 12031 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
 int
-main ()
+main (void)
 {
 
 	Rinit((char *)0)
@@ -12010,16 +12042,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12016: \$? = $ac_status" >&5
+  echo "$as_me:12048: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12022: \$? = $ac_status" >&5
+  echo "$as_me:12054: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -12031,11 +12063,11 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 12034 "configure"
+#line 12066 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
-main ()
+main (void)
 {
 SOCKSinit((char *)0)
   ;
@@ -12043,29 +12075,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12049: \$? = $ac_status" >&5
+  echo "$as_me:12081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12055: \$? = $ac_status" >&5
+  echo "$as_me:12087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks4=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:12061: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:12093: error: Cannot link with socks5 library" >&5
 echo "$as_me: error: Cannot link with socks5 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:12068: result: $cf_use_socks4" >&5
+echo "$as_me:12100: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -12120,16 +12152,16 @@ EOF
 
 fi
 
-echo "$as_me:12123: checking if socks5p.h is available" >&5
+echo "$as_me:12155: checking if socks5p.h is available" >&5
 echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 12126 "configure"
+#line 12158 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
 #include <socks.h>
 int
-main ()
+main (void)
 {
 
 	init((char *)0)
@@ -12138,16 +12170,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12144: \$? = $ac_status" >&5
+  echo "$as_me:12176: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12150: \$? = $ac_status" >&5
+  echo "$as_me:12182: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -12156,7 +12188,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:12159: result: $cf_use_socks5p_h" >&5
+echo "$as_me:12191: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -12168,14 +12200,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:12171: checking for network libraries" >&5
+echo "$as_me:12203: checking for network libraries" >&5
 echo $ECHO_N "checking for network libraries... $ECHO_C" >&6
 
 if test "${cf_cv_netlibs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:12178: result: working..." >&5
+echo "$as_me:12210: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -12187,23 +12219,23 @@ case $host_os in
 for ac_header in windows.h winsock.h winsock2.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12190: checking for $ac_header" >&5
+echo "$as_me:12222: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12196 "configure"
+#line 12228 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12200: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12232: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12206: \$? = $ac_status" >&5
+  echo "$as_me:12238: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12222,7 +12254,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12225: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12257: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12257,7 +12289,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12260 "configure"
+#line 12292 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -12274,7 +12306,7 @@ LIBS="$cf_add_libs"
 #endif
 
 int
-main ()
+main (void)
 {
 
 	char buffer[1024];
@@ -12284,22 +12316,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12290: \$? = $ac_status" >&5
+  echo "$as_me:12322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12296: \$? = $ac_status" >&5
+  echo "$as_me:12328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:12302: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:12334: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12312,13 +12344,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12315: checking for $ac_func" >&5
+echo "$as_me:12347: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12321 "configure"
+#line 12353 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12333,7 +12365,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -12349,16 +12381,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12355: \$? = $ac_status" >&5
+  echo "$as_me:12387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12361: \$? = $ac_status" >&5
+  echo "$as_me:12393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12368,7 +12400,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12371: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12403: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12377,7 +12409,7 @@ EOF
 
 else
 
-echo "$as_me:12380: checking for gethostname in -lnsl" >&5
+echo "$as_me:12412: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12385,7 +12417,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12388 "configure"
+#line 12420 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12396,7 +12428,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char gethostname ();
 int
-main ()
+main (void)
 {
 gethostname ();
   ;
@@ -12404,16 +12436,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12410: \$? = $ac_status" >&5
+  echo "$as_me:12442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12416: \$? = $ac_status" >&5
+  echo "$as_me:12448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -12424,7 +12456,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12427: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:12459: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
 
@@ -12441,7 +12473,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:12444: checking for gethostname in -lsocket" >&5
+echo "$as_me:12476: checking for gethostname in -lsocket" >&5
 echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12449,7 +12481,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12452 "configure"
+#line 12484 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12460,7 +12492,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char gethostname ();
 int
-main ()
+main (void)
 {
 gethostname ();
   ;
@@ -12468,16 +12500,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12474: \$? = $ac_status" >&5
+  echo "$as_me:12506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12480: \$? = $ac_status" >&5
+  echo "$as_me:12512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -12488,7 +12520,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12491: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:12523: result: $ac_cv_lib_socket_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6
 if test $ac_cv_lib_socket_gethostname = yes; then
 
@@ -12512,7 +12544,7 @@ fi
 fi
 done
 
-	echo "$as_me:12515: checking for main in -linet" >&5
+	echo "$as_me:12547: checking for main in -linet" >&5
 echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12520,11 +12552,11 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12523 "configure"
+#line 12555 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 main ();
   ;
@@ -12532,16 +12564,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12538: \$? = $ac_status" >&5
+  echo "$as_me:12570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12544: \$? = $ac_status" >&5
+  echo "$as_me:12576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -12552,7 +12584,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12555: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:12587: result: $ac_cv_lib_inet_main" >&5
 echo "${ECHO_T}$ac_cv_lib_inet_main" >&6
 if test $ac_cv_lib_inet_main = yes; then
   cf_cv_netlibs="-linet $cf_cv_netlibs"
@@ -12563,13 +12595,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12566: checking for $ac_func" >&5
+echo "$as_me:12598: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12572 "configure"
+#line 12604 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12584,7 +12616,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -12600,16 +12632,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12606: \$? = $ac_status" >&5
+  echo "$as_me:12638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12612: \$? = $ac_status" >&5
+  echo "$as_me:12644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12619,7 +12651,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12622: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12654: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12628,7 +12660,7 @@ EOF
 
 else
 
-echo "$as_me:12631: checking for socket in -lsocket" >&5
+echo "$as_me:12663: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12636,7 +12668,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12639 "configure"
+#line 12671 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12647,7 +12679,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char socket ();
 int
-main ()
+main (void)
 {
 socket ();
   ;
@@ -12655,16 +12687,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12661: \$? = $ac_status" >&5
+  echo "$as_me:12693: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12667: \$? = $ac_status" >&5
+  echo "$as_me:12699: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -12675,7 +12707,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12678: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:12710: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
 
@@ -12692,7 +12724,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:12695: checking for socket in -lbsd" >&5
+echo "$as_me:12727: checking for socket in -lbsd" >&5
 echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12700,7 +12732,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12703 "configure"
+#line 12735 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12711,7 +12743,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char socket ();
 int
-main ()
+main (void)
 {
 socket ();
   ;
@@ -12719,16 +12751,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12725: \$? = $ac_status" >&5
+  echo "$as_me:12757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12731: \$? = $ac_status" >&5
+  echo "$as_me:12763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -12739,7 +12771,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12742: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:12774: result: $ac_cv_lib_bsd_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6
 if test $ac_cv_lib_bsd_socket = yes; then
 
@@ -12768,13 +12800,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12771: checking for $ac_func" >&5
+echo "$as_me:12803: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12777 "configure"
+#line 12809 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12789,7 +12821,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -12805,16 +12837,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12811: \$? = $ac_status" >&5
+  echo "$as_me:12843: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12817: \$? = $ac_status" >&5
+  echo "$as_me:12849: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12824,7 +12856,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12827: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12859: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12833,7 +12865,7 @@ EOF
 
 else
 
-echo "$as_me:12836: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:12868: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12841,7 +12873,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12844 "configure"
+#line 12876 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12852,7 +12884,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
-main ()
+main (void)
 {
 gethostbyname ();
   ;
@@ -12860,16 +12892,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12866: \$? = $ac_status" >&5
+  echo "$as_me:12898: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12872: \$? = $ac_status" >&5
+  echo "$as_me:12904: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12880,7 +12912,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12883: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12915: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
 
@@ -12905,13 +12937,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12908: checking for $ac_func" >&5
+echo "$as_me:12940: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12914 "configure"
+#line 12946 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12926,7 +12958,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -12942,16 +12974,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12948: \$? = $ac_status" >&5
+  echo "$as_me:12980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12954: \$? = $ac_status" >&5
+  echo "$as_me:12986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12961,7 +12993,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12964: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12996: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12970,7 +13002,7 @@ EOF
 
 else
 
-echo "$as_me:12973: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:13005: checking for inet_ntoa in -lnsl" >&5
 echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12978,7 +13010,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12981 "configure"
+#line 13013 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12989,7 +13021,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char inet_ntoa ();
 int
-main ()
+main (void)
 {
 inet_ntoa ();
   ;
@@ -12997,16 +13029,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13003: \$? = $ac_status" >&5
+  echo "$as_me:13035: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13009: \$? = $ac_status" >&5
+  echo "$as_me:13041: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -13017,7 +13049,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13020: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:13052: result: $ac_cv_lib_nsl_inet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
 if test $ac_cv_lib_nsl_inet_ntoa = yes; then
 
@@ -13042,13 +13074,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13045: checking for $ac_func" >&5
+echo "$as_me:13077: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13051 "configure"
+#line 13083 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13063,7 +13095,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -13079,16 +13111,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13085: \$? = $ac_status" >&5
+  echo "$as_me:13117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13091: \$? = $ac_status" >&5
+  echo "$as_me:13123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13098,7 +13130,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13101: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13133: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13107,7 +13139,7 @@ EOF
 
 else
 
-echo "$as_me:13110: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:13142: checking for gethostbyname in -lnetwork" >&5
 echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6
 if test "${ac_cv_lib_network_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13115,7 +13147,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13118 "configure"
+#line 13150 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13126,7 +13158,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
-main ()
+main (void)
 {
 gethostbyname ();
   ;
@@ -13134,16 +13166,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13140: \$? = $ac_status" >&5
+  echo "$as_me:13172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13146: \$? = $ac_status" >&5
+  echo "$as_me:13178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -13154,7 +13186,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13157: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:13189: result: $ac_cv_lib_network_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6
 if test $ac_cv_lib_network_gethostbyname = yes; then
 
@@ -13179,13 +13211,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13182: checking for $ac_func" >&5
+echo "$as_me:13214: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13188 "configure"
+#line 13220 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13200,7 +13232,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -13216,16 +13248,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13251: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13222: \$? = $ac_status" >&5
+  echo "$as_me:13254: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13228: \$? = $ac_status" >&5
+  echo "$as_me:13260: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13235,7 +13267,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13238: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13270: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13244,7 +13276,7 @@ EOF
 
 else
 
-echo "$as_me:13247: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:13279: checking for strcasecmp in -lresolv" >&5
 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13252,7 +13284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13255 "configure"
+#line 13287 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13263,7 +13295,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char strcasecmp ();
 int
-main ()
+main (void)
 {
 strcasecmp ();
   ;
@@ -13271,16 +13303,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13277: \$? = $ac_status" >&5
+  echo "$as_me:13309: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13283: \$? = $ac_status" >&5
+  echo "$as_me:13315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -13291,7 +13323,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13294: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:13326: result: $ac_cv_lib_resolv_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
 if test $ac_cv_lib_resolv_strcasecmp = yes; then
 
@@ -13348,14 +13380,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:13351: checking for inet_aton function" >&5
+echo "$as_me:13383: checking for inet_aton function" >&5
 echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_aton+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13358 "configure"
+#line 13390 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13382,7 +13414,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 inet_aton(0, (struct in_addr *)0)
   ;
@@ -13390,16 +13422,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13393: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13396: \$? = $ac_status" >&5
+  echo "$as_me:13428: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13402: \$? = $ac_status" >&5
+  echo "$as_me:13434: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -13409,7 +13441,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13412: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:13444: result: $cf_cv_have_inet_aton" >&5
 echo "${ECHO_T}$cf_cv_have_inet_aton" >&6
 if test "$cf_cv_have_inet_aton" = yes ; then
 
@@ -13418,14 +13450,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:13421: checking for inet_addr function" >&5
+    echo "$as_me:13453: checking for inet_addr function" >&5
 echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 13428 "configure"
+#line 13460 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13452,7 +13484,7 @@ else
 #endif
 
 int
-main ()
+main (void)
 {
 inet_addr(0)
   ;
@@ -13460,16 +13492,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13466: \$? = $ac_status" >&5
+  echo "$as_me:13498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13472: \$? = $ac_status" >&5
+  echo "$as_me:13504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -13479,10 +13511,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13482: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:13514: result: $cf_cv_have_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_have_inet_addr" >&6
     if test "$cf_cv_have_inet_addr" = no ; then
-	echo "$as_me:13485: checking for library with inet_addr" >&5
+	echo "$as_me:13517: checking for library with inet_addr" >&5
 echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6
 if test "${cf_cv_lib_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13493,7 +13525,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13496 "configure"
+#line 13528 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13501,7 +13533,7 @@ else
 #include <arpa/inet.h>
 
 int
-main ()
+main (void)
 {
 inet_addr(0)
   ;
@@ -13509,16 +13541,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13515: \$? = $ac_status" >&5
+  echo "$as_me:13547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13521: \$? = $ac_status" >&5
+  echo "$as_me:13553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -13532,7 +13564,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:13535: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:13567: result: $cf_cv_lib_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
 	if test "$cf_cv_lib_inet_addr" != no ; then
 
@@ -13553,13 +13585,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:13556: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:13588: WARNING: Unable to find library for inet_addr function" >&5
 echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
 	fi
     fi
 fi
 
-echo "$as_me:13562: checking if you want to use pkg-config" >&5
+echo "$as_me:13594: checking if you want to use pkg-config" >&5
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
@@ -13569,7 +13601,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:13572: result: $cf_pkg_config" >&5
+echo "$as_me:13604: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in
@@ -13581,7 +13613,7 @@ case $cf_pkg_config in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:13584: checking for $ac_word" >&5
+echo "$as_me:13616: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13598,7 +13630,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:13601: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13633: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13609,10 +13641,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:13612: result: $PKG_CONFIG" >&5
+  echo "$as_me:13644: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:13615: result: no" >&5
+  echo "$as_me:13647: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13621,7 +13653,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:13624: checking for $ac_word" >&5
+echo "$as_me:13656: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13638,7 +13670,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:13641: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13673: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13650,10 +13682,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:13653: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:13685: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:13656: result: no" >&5
+  echo "$as_me:13688: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13696,14 +13728,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:13699: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:13731: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
-	{ echo "$as_me:13706: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:13738: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -13748,11 +13780,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13751 "configure"
+#line 13783 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -13760,16 +13792,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13766: \$? = $ac_status" >&5
+  echo "$as_me:13798: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13772: \$? = $ac_status" >&5
+  echo "$as_me:13804: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13786,7 +13818,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13789: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13821: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13829,11 +13861,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13832 "configure"
+#line 13864 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -13841,16 +13873,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13876: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13847: \$? = $ac_status" >&5
+  echo "$as_me:13879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13853: \$? = $ac_status" >&5
+  echo "$as_me:13885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13867,7 +13899,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13870: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13902: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13885,7 +13917,7 @@ echo "${as_me:-configure}:13870: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13888: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13920: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13910,7 +13942,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13913: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13945: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13939,7 +13971,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:13942: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13974: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13948,7 +13980,7 @@ echo "${as_me:-configure}:13942: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13951: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13983: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13965,15 +13997,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:13968: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:14000: checking pkg-config for $cf_try_package" >&5
 echo $ECHO_N "checking pkg-config for $cf_try_package... $ECHO_C" >&6
 				if "$PKG_CONFIG" --exists $cf_try_package ; then
 					cf_cv_pkg_ssl=$cf_try_package
-					echo "$as_me:13972: result: yes" >&5
+					echo "$as_me:14004: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:13976: result: no" >&5
+					echo "$as_me:14008: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -14117,7 +14149,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:14120: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14152: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -14153,7 +14185,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:14156: checking for dlsym in -ldl" >&5
+				echo "$as_me:14188: checking for dlsym in -ldl" >&5
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14161,7 +14193,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14164 "configure"
+#line 14196 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14172,7 +14204,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char dlsym ();
 int
-main ()
+main (void)
 {
 dlsym ();
   ;
@@ -14180,16 +14212,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14186: \$? = $ac_status" >&5
+  echo "$as_me:14218: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14192: \$? = $ac_status" >&5
+  echo "$as_me:14224: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -14200,7 +14232,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14203: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:14235: result: $ac_cv_lib_dl_dlsym" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 if test $ac_cv_lib_dl_dlsym = yes; then
   cf_extra_ssl_libs="$cf_extra_ssl_libs -ldl"
@@ -14216,12 +14248,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:14219: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14251: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14224 "configure"
+#line 14256 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14236,7 +14268,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -14250,16 +14282,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14256: \$? = $ac_status" >&5
+  echo "$as_me:14288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14262: \$? = $ac_status" >&5
+  echo "$as_me:14294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14273,7 +14305,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14276 "configure"
+#line 14308 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14288,7 +14320,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -14302,16 +14334,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14337: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14308: \$? = $ac_status" >&5
+  echo "$as_me:14340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14314: \$? = $ac_status" >&5
+  echo "$as_me:14346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14328,9 +14360,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:14331: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:14363: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:14333: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14365: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14421,11 +14453,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_ssl ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14424: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14456: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 14428 "configure"
+#line 14460 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14440,7 +14472,7 @@ echo "${as_me:-configure}:14424: testing ... testing $cf_cv_header_path_ssl ..."
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -14454,21 +14486,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14460: \$? = $ac_status" >&5
+  echo "$as_me:14492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14466: \$? = $ac_status" >&5
+  echo "$as_me:14498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14471: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14503: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14486,7 +14518,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:14489: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14521: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14494,7 +14526,7 @@ echo "${as_me:-configure}:14489: testing Searching for ssl library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14497 "configure"
+#line 14529 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14509,7 +14541,7 @@ echo "${as_me:-configure}:14489: testing Searching for ssl library in FIND_LINKA
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -14523,21 +14555,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14529: \$? = $ac_status" >&5
+  echo "$as_me:14561: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14535: \$? = $ac_status" >&5
+  echo "$as_me:14567: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:14540: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:14572: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -14618,13 +14650,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_ssl ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14621: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14653: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 14627 "configure"
+#line 14659 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14639,7 +14671,7 @@ echo "${as_me:-configure}:14621: testing ... testing $cf_cv_library_path_ssl ...
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -14653,21 +14685,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14659: \$? = $ac_status" >&5
+  echo "$as_me:14691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14665: \$? = $ac_status" >&5
+  echo "$as_me:14697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14670: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14702: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -14729,7 +14761,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14732: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14764: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14785,11 +14817,11 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14788 "configure"
+#line 14820 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -14797,16 +14829,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14800: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14803: \$? = $ac_status" >&5
+  echo "$as_me:14835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14809: \$? = $ac_status" >&5
+  echo "$as_me:14841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14823,7 +14855,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:14826: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14858: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14856,7 +14888,7 @@ EOF
 		if test -n "$cf_cv_header_path_ssl" ; then
 			test -n "$verbose" && echo "	checking ssl header-path $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14859: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14891: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case $cf_cv_header_path_ssl in
 			(*/openssl)
@@ -14869,10 +14901,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:14872: checking for X509 support" >&5
+echo "$as_me:14904: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14875 "configure"
+#line 14907 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14893,7 +14925,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
   ;
@@ -14901,16 +14933,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14904: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14936: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14907: \$? = $ac_status" >&5
+  echo "$as_me:14939: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14913: \$? = $ac_status" >&5
+  echo "$as_me:14945: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14919,7 +14951,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14922: result: $cf_x509_support" >&5
+echo "$as_me:14954: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -14971,11 +15003,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14974 "configure"
+#line 15006 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -14983,16 +15015,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14989: \$? = $ac_status" >&5
+  echo "$as_me:15021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14995: \$? = $ac_status" >&5
+  echo "$as_me:15027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15009,7 +15041,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:15012: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15044: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15052,11 +15084,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15055 "configure"
+#line 15087 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -15064,16 +15096,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15070: \$? = $ac_status" >&5
+  echo "$as_me:15102: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15076: \$? = $ac_status" >&5
+  echo "$as_me:15108: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15090,7 +15122,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:15093: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15125: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15108,7 +15140,7 @@ echo "${as_me:-configure}:15093: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:15111: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15143: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15133,7 +15165,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15136: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15168: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15162,7 +15194,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15165: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15197: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15171,7 +15203,7 @@ echo "${as_me:-configure}:15165: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:15174: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15206: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15189,12 +15221,12 @@ esac
 		(yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:15192: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15224: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:15197: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15229: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -15326,7 +15358,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:15329: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:15361: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -15348,7 +15380,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:15351: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15383: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -15368,12 +15400,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:15371: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15403: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15376 "configure"
+#line 15408 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15388,7 +15420,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -15402,16 +15434,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15408: \$? = $ac_status" >&5
+  echo "$as_me:15440: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15414: \$? = $ac_status" >&5
+  echo "$as_me:15446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15425,7 +15457,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15428 "configure"
+#line 15460 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15440,7 +15472,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -15454,16 +15486,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15457: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15460: \$? = $ac_status" >&5
+  echo "$as_me:15492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15466: \$? = $ac_status" >&5
+  echo "$as_me:15498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15480,9 +15512,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15483: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15515: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15485: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15517: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15573,11 +15605,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_gnutls ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15576: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15608: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15580 "configure"
+#line 15612 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15592,7 +15624,7 @@ echo "${as_me:-configure}:15576: testing ... testing $cf_cv_header_path_gnutls .
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -15606,21 +15638,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15641: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15612: \$? = $ac_status" >&5
+  echo "$as_me:15644: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15618: \$? = $ac_status" >&5
+  echo "$as_me:15650: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15623: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15655: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15638,7 +15670,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15641: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15673: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -15713,13 +15745,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_gnutls ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15716: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15748: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 15722 "configure"
+#line 15754 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15734,7 +15766,7 @@ echo "${as_me:-configure}:15716: testing ... testing $cf_cv_library_path_gnutls
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -15748,21 +15780,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15754: \$? = $ac_status" >&5
+  echo "$as_me:15786: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15760: \$? = $ac_status" >&5
+  echo "$as_me:15792: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15765: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15797: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -15839,11 +15871,11 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15842 "configure"
+#line 15874 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -15851,16 +15883,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15857: \$? = $ac_status" >&5
+  echo "$as_me:15889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15863: \$? = $ac_status" >&5
+  echo "$as_me:15895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15877,7 +15909,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:15880: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15912: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15918,7 +15950,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15921: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15953: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15947,13 +15979,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15950: checking for $ac_func" >&5
+echo "$as_me:15982: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15956 "configure"
+#line 15988 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15968,7 +16000,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -15984,16 +16016,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15990: \$? = $ac_status" >&5
+  echo "$as_me:16022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15996: \$? = $ac_status" >&5
+  echo "$as_me:16028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16003,7 +16035,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16006: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:16038: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -16013,13 +16045,13 @@ EOF
 fi
 done
 
-		echo "$as_me:16016: checking for gnutls_rnd" >&5
+		echo "$as_me:16048: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16022 "configure"
+#line 16054 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -16034,7 +16066,7 @@ char gnutls_rnd ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -16050,16 +16082,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16056: \$? = $ac_status" >&5
+  echo "$as_me:16088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16062: \$? = $ac_status" >&5
+  echo "$as_me:16094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -16069,7 +16101,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16072: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:16104: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -16098,10 +16130,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:16101: checking for X509 support" >&5
+echo "$as_me:16133: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16104 "configure"
+#line 16136 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16122,7 +16154,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
   ;
@@ -16130,16 +16162,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16136: \$? = $ac_status" >&5
+  echo "$as_me:16168: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16142: \$? = $ac_status" >&5
+  echo "$as_me:16174: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -16148,7 +16180,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:16151: result: $cf_x509_support" >&5
+echo "$as_me:16183: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -16199,11 +16231,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16202 "configure"
+#line 16234 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -16211,16 +16243,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16246: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16217: \$? = $ac_status" >&5
+  echo "$as_me:16249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16223: \$? = $ac_status" >&5
+  echo "$as_me:16255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16237,7 +16269,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16240: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16272: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16280,11 +16312,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16283 "configure"
+#line 16315 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -16292,16 +16324,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16298: \$? = $ac_status" >&5
+  echo "$as_me:16330: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16304: \$? = $ac_status" >&5
+  echo "$as_me:16336: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16318,7 +16350,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:16321: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16353: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16336,7 +16368,7 @@ echo "${as_me:-configure}:16321: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16339: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16371: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16361,7 +16393,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16364: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16396: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16390,7 +16422,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16393: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16425: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16399,7 +16431,7 @@ echo "${as_me:-configure}:16393: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16402: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16434: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -16417,12 +16449,12 @@ esac
 		(yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:16420: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:16452: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16425: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16457: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -16554,7 +16586,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16557: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16589: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -16576,7 +16608,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16579: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16611: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16596,12 +16628,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16599: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16631: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16604 "configure"
+#line 16636 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16616,7 +16648,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -16630,16 +16662,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16636: \$? = $ac_status" >&5
+  echo "$as_me:16668: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16642: \$? = $ac_status" >&5
+  echo "$as_me:16674: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16653,7 +16685,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16656 "configure"
+#line 16688 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16668,7 +16700,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -16682,16 +16714,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16688: \$? = $ac_status" >&5
+  echo "$as_me:16720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16694: \$? = $ac_status" >&5
+  echo "$as_me:16726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16708,9 +16740,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16711: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16743: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16713: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16745: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16801,11 +16833,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_gnutls ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16804: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16836: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 16808 "configure"
+#line 16840 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16820,7 +16852,7 @@ echo "${as_me:-configure}:16804: testing ... testing $cf_cv_header_path_gnutls .
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -16834,21 +16866,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16840: \$? = $ac_status" >&5
+  echo "$as_me:16872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16846: \$? = $ac_status" >&5
+  echo "$as_me:16878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16851: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16883: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16866,7 +16898,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16869: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16901: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -16941,13 +16973,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_gnutls ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16944: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16976: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 16950 "configure"
+#line 16982 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16962,7 +16994,7 @@ echo "${as_me:-configure}:16944: testing ... testing $cf_cv_library_path_gnutls
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef USE_GNUTLS_FUNCS
@@ -16976,21 +17008,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16982: \$? = $ac_status" >&5
+  echo "$as_me:17014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16988: \$? = $ac_status" >&5
+  echo "$as_me:17020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16993: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17025: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -17067,11 +17099,11 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17070 "configure"
+#line 17102 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -17079,16 +17111,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17085: \$? = $ac_status" >&5
+  echo "$as_me:17117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17091: \$? = $ac_status" >&5
+  echo "$as_me:17123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17105,7 +17137,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:17108: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17140: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17146,7 +17178,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:17149: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17181: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17175,13 +17207,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17178: checking for $ac_func" >&5
+echo "$as_me:17210: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17184 "configure"
+#line 17216 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17196,7 +17228,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -17212,16 +17244,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17218: \$? = $ac_status" >&5
+  echo "$as_me:17250: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17224: \$? = $ac_status" >&5
+  echo "$as_me:17256: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17231,7 +17263,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17234: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:17266: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17241,13 +17273,13 @@ EOF
 fi
 done
 
-		echo "$as_me:17244: checking for gnutls_rnd" >&5
+		echo "$as_me:17276: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17250 "configure"
+#line 17282 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -17262,7 +17294,7 @@ char gnutls_rnd ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -17278,16 +17310,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17281: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17284: \$? = $ac_status" >&5
+  echo "$as_me:17316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17290: \$? = $ac_status" >&5
+  echo "$as_me:17322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -17297,7 +17329,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17300: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:17332: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -17325,7 +17357,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:17328: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:17360: checking for SSL_connect in -lgnutls-openssl" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17333,7 +17365,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17336 "configure"
+#line 17368 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17344,7 +17376,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char SSL_connect ();
 int
-main ()
+main (void)
 {
 SSL_connect ();
   ;
@@ -17352,16 +17384,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17358: \$? = $ac_status" >&5
+  echo "$as_me:17390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17364: \$? = $ac_status" >&5
+  echo "$as_me:17396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -17372,7 +17404,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17375: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:17407: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
 
@@ -17393,7 +17425,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:17396: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:17428: checking for SSL_connect in -lgnutls-extra" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17401,7 +17433,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17404 "configure"
+#line 17436 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17412,7 +17444,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char SSL_connect ();
 int
-main ()
+main (void)
 {
 SSL_connect ();
   ;
@@ -17420,16 +17452,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17426: \$? = $ac_status" >&5
+  echo "$as_me:17458: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17432: \$? = $ac_status" >&5
+  echo "$as_me:17464: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -17440,7 +17472,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17443: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:17475: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
 
@@ -17461,7 +17493,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:17464: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:17496: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17470,10 +17502,10 @@ fi
 
 			fi
 
-echo "$as_me:17473: checking for X509 support" >&5
+echo "$as_me:17505: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17476 "configure"
+#line 17508 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17494,7 +17526,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
   ;
@@ -17502,16 +17534,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17508: \$? = $ac_status" >&5
+  echo "$as_me:17540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17514: \$? = $ac_status" >&5
+  echo "$as_me:17546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -17520,7 +17552,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17523: result: $cf_x509_support" >&5
+echo "$as_me:17555: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17552,7 +17584,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:17555: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:17587: checking for SSL_get_version in -lnss_compat_ossl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
 if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17560,7 +17592,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17563 "configure"
+#line 17595 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17571,7 +17603,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char SSL_get_version ();
 int
-main ()
+main (void)
 {
 SSL_get_version ();
   ;
@@ -17579,16 +17611,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17585: \$? = $ac_status" >&5
+  echo "$as_me:17617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17591: \$? = $ac_status" >&5
+  echo "$as_me:17623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -17599,7 +17631,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17602: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:17634: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
 if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -17614,11 +17646,11 @@ else
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me:-configure}:17617: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:17649: testing assume it is in $cf_ssl_root ..." 1>&5
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
-			{ { echo "$as_me:17621: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:17653: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -17633,13 +17665,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:17636: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:17668: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:17642: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:17674: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -17768,16 +17800,16 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17771: checking for NSS compilant include directory" >&5
+echo "$as_me:17803: checking for NSS compilant include directory" >&5
 echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17774 "configure"
+#line 17806 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <nss_compat_ossl/nss_compat_ossl.h>
 int
-main ()
+main (void)
 {
 SSL_shutdown((SSL *)0)
   ;
@@ -17785,16 +17817,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17791: \$? = $ac_status" >&5
+  echo "$as_me:17823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17797: \$? = $ac_status" >&5
+  echo "$as_me:17829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17803,7 +17835,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17806: result: $cf_ssl_incl" >&5
+echo "$as_me:17838: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -17812,10 +17844,10 @@ EOF
 
 fi
 
-echo "$as_me:17815: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17847: checking if we can link to NSS compilant library" >&5
 echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17818 "configure"
+#line 17850 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17826,7 +17858,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 SSL_shutdown((SSL *)0)
   ;
@@ -17834,16 +17866,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17840: \$? = $ac_status" >&5
+  echo "$as_me:17872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17846: \$? = $ac_status" >&5
+  echo "$as_me:17878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17852,7 +17884,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17855: result: $cf_ssl_library" >&5
+echo "$as_me:17887: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -17865,7 +17897,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:17868: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:17900: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17873,7 +17905,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:17876: checking whether to enable ipv6" >&5
+echo "$as_me:17908: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -17890,11 +17922,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17893: result: $enableval" >&5
+echo "$as_me:17925: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17897: checking ipv6 stack type" >&5
+echo "$as_me:17929: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17915,7 +17947,7 @@ do
 		;;
 	(inria)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17918 "configure"
+#line 17950 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17932,7 +17964,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17935 "configure"
+#line 17967 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17949,7 +17981,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17952 "configure"
+#line 17984 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -17975,7 +18007,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17978 "configure"
+#line 18010 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17992,7 +18024,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17995 "configure"
+#line 18027 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -18009,7 +18041,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18012 "configure"
+#line 18044 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -18031,13 +18063,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:18034: result: $cf_cv_ipv6type" >&5
+echo "$as_me:18066: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:18040: checking for IPv6 library if required" >&5
+echo "$as_me:18072: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in
 (solaris)
@@ -18067,13 +18099,13 @@ case $cf_cv_ipv6type in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:18070: result: $cf_ipv6lib" >&5
+echo "$as_me:18102: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18076 "configure"
+#line 18108 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18081,7 +18113,7 @@ if test "$cf_ipv6lib" != "none"; then
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 int
-main ()
+main (void)
 {
 getaddrinfo(0, 0, 0, 0)
   ;
@@ -18089,16 +18121,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18095: \$? = $ac_status" >&5
+  echo "$as_me:18127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18101: \$? = $ac_status" >&5
+  echo "$as_me:18133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18216,11 +18248,11 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18219 "configure"
+#line 18251 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -18228,16 +18260,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18263: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18234: \$? = $ac_status" >&5
+  echo "$as_me:18266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18240: \$? = $ac_status" >&5
+  echo "$as_me:18272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18254,7 +18286,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:18257: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18289: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18282,13 +18314,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:18285: checking for getaddrinfo" >&5
+	echo "$as_me:18317: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18291 "configure"
+#line 18323 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -18303,7 +18335,7 @@ char getaddrinfo ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -18319,16 +18351,16 @@ f = getaddrinfo; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18325: \$? = $ac_status" >&5
+  echo "$as_me:18357: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18331: \$? = $ac_status" >&5
+  echo "$as_me:18363: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -18338,18 +18370,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18341: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:18373: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:18348: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:18380: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18352 "configure"
+#line 18384 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18357,7 +18389,7 @@ echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 int
-main ()
+main (void)
 {
 getaddrinfo(0, 0, 0, 0)
   ;
@@ -18365,25 +18397,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18371: \$? = $ac_status" >&5
+  echo "$as_me:18403: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18377: \$? = $ac_status" >&5
+  echo "$as_me:18409: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18379: result: yes" >&5
+  echo "$as_me:18411: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18386: result: no" >&5
+echo "$as_me:18418: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -18451,11 +18483,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18454: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:18486: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 18458 "configure"
+#line 18490 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18463,7 +18495,7 @@ echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 int
-main ()
+main (void)
 {
 getaddrinfo(0, 0, 0, 0)
   ;
@@ -18471,25 +18503,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18477: \$? = $ac_status" >&5
+  echo "$as_me:18509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18483: \$? = $ac_status" >&5
+  echo "$as_me:18515: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18485: result: yes" >&5
+  echo "$as_me:18517: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18492: result: no" >&5
+echo "$as_me:18524: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18504,7 +18536,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:18507: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:18539: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -18512,7 +18544,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:18515: checking working getaddrinfo" >&5
+echo "$as_me:18547: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18522,7 +18554,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18525 "configure"
+#line 18557 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18533,7 +18565,7 @@ else
 
 #define expect(a,b) if (strcmp(a,b) != 0) goto bad
 
-int main()
+int main(void)
 {
    int passive, gaierr, inet4 = 0, inet6 = 0;
    struct addrinfo hints, *ai, *aitop;
@@ -18602,15 +18634,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18608: \$? = $ac_status" >&5
+  echo "$as_me:18640: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18613: \$? = $ac_status" >&5
+  echo "$as_me:18645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -18623,7 +18655,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:18626: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18658: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -18639,12 +18671,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:18642: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:18674: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:18647: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:18679: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -18655,7 +18687,7 @@ fi
 
 fi
 
-echo "$as_me:18658: checking for screen type" >&5
+echo "$as_me:18690: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18669,7 +18701,7 @@ case $withval in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:18672: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:18704: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18678,13 +18710,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:18681: result: $cf_cv_screen" >&5
+echo "$as_me:18713: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|ncurses*)
 
-echo "$as_me:18687: checking for specific curses-directory" >&5
+echo "$as_me:18719: checking for specific curses-directory" >&5
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
@@ -18694,7 +18726,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:18697: result: $cf_cv_curses_dir" >&5
+echo "$as_me:18729: result: $cf_cv_curses_dir" >&5
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
@@ -18725,7 +18757,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18728: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18760: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18758,11 +18790,11 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18761 "configure"
+#line 18793 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -18770,16 +18802,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18773: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18776: \$? = $ac_status" >&5
+  echo "$as_me:18808: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18782: \$? = $ac_status" >&5
+  echo "$as_me:18814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18796,7 +18828,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:18799: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18831: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18832,7 +18864,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18835: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18867: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18851,7 +18883,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 (curses)
 
-echo "$as_me:18854: checking for extra include directories" >&5
+echo "$as_me:18886: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18877,11 +18909,11 @@ case $host_os in
 esac
 
 fi
-echo "$as_me:18880: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18912: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:18884: checking if we have identified curses headers" >&5
+echo "$as_me:18916: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18893,11 +18925,11 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18896 "configure"
+#line 18928 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
-main ()
+main (void)
 {
 initscr(); tgoto("?", 0,0)
   ;
@@ -18905,16 +18937,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18940: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18911: \$? = $ac_status" >&5
+  echo "$as_me:18943: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18917: \$? = $ac_status" >&5
+  echo "$as_me:18949: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18925,11 +18957,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18928: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18960: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:18932: error: No curses header-files found" >&5
+	{ { echo "$as_me:18964: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18939,23 +18971,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18942: checking for $ac_header" >&5
+echo "$as_me:18974: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18948 "configure"
+#line 18980 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18952: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18984: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18958: \$? = $ac_status" >&5
+  echo "$as_me:18990: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18974,7 +19006,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18977: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19009: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18984,7 +19016,7 @@ EOF
 fi
 done
 
-echo "$as_me:18987: checking for terminfo header" >&5
+echo "$as_me:19019: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19002,14 +19034,14 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19005 "configure"
+#line 19037 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
-main ()
+main (void)
 {
 int x = auto_left_margin
   ;
@@ -19017,16 +19049,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19052: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19023: \$? = $ac_status" >&5
+  echo "$as_me:19055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19029: \$? = $ac_status" >&5
+  echo "$as_me:19061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -19042,7 +19074,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:19045: result: $cf_cv_term_header" >&5
+echo "$as_me:19077: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -19074,7 +19106,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19077: checking for ncurses version" >&5
+echo "$as_me:19109: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19100,10 +19132,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:19103: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:19135: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:19106: \$? = $ac_status" >&5
+  echo "$as_me:19138: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -19113,12 +19145,12 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19116 "configure"
+#line 19148 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
-int main()
+int main(void)
 {
 	FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
@@ -19138,15 +19170,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19144: \$? = $ac_status" >&5
+  echo "$as_me:19176: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19149: \$? = $ac_status" >&5
+  echo "$as_me:19181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -19160,21 +19192,21 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:19163: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:19195: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:19170: checking if we have identified curses libraries" >&5
+echo "$as_me:19202: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 19173 "configure"
+#line 19205 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr(); tgoto("?", 0,0)
   ;
@@ -19182,16 +19214,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19188: \$? = $ac_status" >&5
+  echo "$as_me:19220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19194: \$? = $ac_status" >&5
+  echo "$as_me:19226: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19200,13 +19232,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:19203: result: $cf_result" >&5
+echo "$as_me:19235: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in
 (freebsd*)
-	echo "$as_me:19209: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:19241: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19214,7 +19246,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19217 "configure"
+#line 19249 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19225,7 +19257,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char tgoto ();
 int
-main ()
+main (void)
 {
 tgoto ();
   ;
@@ -19233,16 +19265,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19239: \$? = $ac_status" >&5
+  echo "$as_me:19271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19245: \$? = $ac_status" >&5
+  echo "$as_me:19277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -19253,7 +19285,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19256: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:19288: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
 
@@ -19283,7 +19315,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:19286: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:19318: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19291,7 +19323,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19294 "configure"
+#line 19326 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19302,7 +19334,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -19310,16 +19342,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19316: \$? = $ac_status" >&5
+  echo "$as_me:19348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19322: \$? = $ac_status" >&5
+  echo "$as_me:19354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -19330,7 +19362,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19333: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:19365: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -19354,7 +19386,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19357: checking for initscr in -lHcurses" >&5
+		echo "$as_me:19389: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19362,7 +19394,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19365 "configure"
+#line 19397 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19373,7 +19405,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -19381,16 +19413,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19387: \$? = $ac_status" >&5
+  echo "$as_me:19419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19393: \$? = $ac_status" >&5
+  echo "$as_me:19425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -19401,7 +19433,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19404: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:19436: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -19457,7 +19489,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19460: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19492: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19486,7 +19518,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19489: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19521: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19517,7 +19549,7 @@ if test -n "/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19520: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19552: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19552,7 +19584,7 @@ if test -n "/usr/5lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19555: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19587: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19596,13 +19628,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:19599: checking for tgoto" >&5
+		echo "$as_me:19631: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19605 "configure"
+#line 19637 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -19617,7 +19649,7 @@ char tgoto ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -19633,16 +19665,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19636: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19639: \$? = $ac_status" >&5
+  echo "$as_me:19671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19645: \$? = $ac_status" >&5
+  echo "$as_me:19677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -19652,7 +19684,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19655: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:19687: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -19661,7 +19693,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:19664: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:19696: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19669,7 +19701,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19672 "configure"
+#line 19704 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19680,7 +19712,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char tgoto ();
 int
-main ()
+main (void)
 {
 tgoto ();
   ;
@@ -19688,16 +19720,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19694: \$? = $ac_status" >&5
+  echo "$as_me:19726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19700: \$? = $ac_status" >&5
+  echo "$as_me:19732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19708,7 +19740,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19711: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19743: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -19727,7 +19759,7 @@ fi
 		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
 		do
 			as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:19730: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:19762: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19735,7 +19767,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19738 "configure"
+#line 19770 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19746,7 +19778,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -19754,16 +19786,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19757: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19760: \$? = $ac_status" >&5
+  echo "$as_me:19792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19766: \$? = $ac_status" >&5
+  echo "$as_me:19798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19774,7 +19806,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19777: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19809: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -19782,20 +19814,20 @@ fi
 
 		done
 	fi
-	test $cf_curs_lib = unknown && { { echo "$as_me:19785: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:19817: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
-		echo "$as_me:19791: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:19823: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 19794 "configure"
+#line 19826 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr()
   ;
@@ -19803,16 +19835,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19809: \$? = $ac_status" >&5
+  echo "$as_me:19841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19815: \$? = $ac_status" >&5
+  echo "$as_me:19847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19821,22 +19853,22 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19824: result: $cf_result" >&5
+		echo "$as_me:19856: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:19826: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:19858: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
 	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 		:
 	elif test "$cf_term_lib" != predefined ; then
-		echo "$as_me:19832: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:19864: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 19835 "configure"
+#line 19867 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr(); tgoto((char *)0, 0, 0);
   ;
@@ -19844,16 +19876,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19850: \$? = $ac_status" >&5
+  echo "$as_me:19882: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19856: \$? = $ac_status" >&5
+  echo "$as_me:19888: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19862,11 +19894,11 @@ cat conftest.$ac_ext >&5
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 19865 "configure"
+#line 19897 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr()
   ;
@@ -19874,16 +19906,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19909: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19880: \$? = $ac_status" >&5
+  echo "$as_me:19912: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19886: \$? = $ac_status" >&5
+  echo "$as_me:19918: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19895,13 +19927,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19898: result: $cf_result" >&5
+		echo "$as_me:19930: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:19904: checking for curses performance tradeoff" >&5
+echo "$as_me:19936: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19909,12 +19941,12 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19912 "configure"
+#line 19944 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 
 #if defined(wbkgdset) && defined(clearok) && defined(getbkgd)
@@ -19928,26 +19960,26 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19934: \$? = $ac_status" >&5
+  echo "$as_me:19966: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19940: \$? = $ac_status" >&5
+  echo "$as_me:19972: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19944 "configure"
+#line 19976 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 
 #if defined(wbkgdset) && defined(clearok) && defined(getbkgd)
@@ -19961,16 +19993,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19967: \$? = $ac_status" >&5
+  echo "$as_me:19999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19973: \$? = $ac_status" >&5
+  echo "$as_me:20005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -19985,26 +20017,26 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:19988: result: $cf_cv_curs_performance" >&5
+echo "$as_me:20020: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes &&
 cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:19995: checking for curses touchline function" >&5
+echo "$as_me:20027: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20002 "configure"
+#line 20034 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 touchline(stdscr, 1,2,3);
   ;
@@ -20012,28 +20044,28 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20018: \$? = $ac_status" >&5
+  echo "$as_me:20050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20024: \$? = $ac_status" >&5
+  echo "$as_me:20056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 20031 "configure"
+#line 20063 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 touchline(stdscr, 1,2);
   ;
@@ -20041,16 +20073,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20076: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20047: \$? = $ac_status" >&5
+  echo "$as_me:20079: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20053: \$? = $ac_status" >&5
+  echo "$as_me:20085: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -20062,7 +20094,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20065: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:20097: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -20084,7 +20116,7 @@ esac
 	;;
 (ncursesw*)
 
-echo "$as_me:20087: checking for multibyte character support" >&5
+echo "$as_me:20119: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20092,12 +20124,12 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20095 "configure"
+#line 20127 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 int
-main ()
+main (void)
 {
 putwc(0,0);
   ;
@@ -20105,16 +20137,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20111: \$? = $ac_status" >&5
+  echo "$as_me:20143: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20117: \$? = $ac_status" >&5
+  echo "$as_me:20149: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -20126,17 +20158,17 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:20129: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20161: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20134 "configure"
+#line 20166 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
 int
-main ()
+main (void)
 {
 putwc(0,0);
   ;
@@ -20144,16 +20176,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20150: \$? = $ac_status" >&5
+  echo "$as_me:20182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20156: \$? = $ac_status" >&5
+  echo "$as_me:20188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20167,12 +20199,12 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20170 "configure"
+#line 20202 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
 int
-main ()
+main (void)
 {
 putwc(0,0);
   ;
@@ -20180,16 +20212,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20186: \$? = $ac_status" >&5
+  echo "$as_me:20218: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20192: \$? = $ac_status" >&5
+  echo "$as_me:20224: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20206,9 +20238,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:20209: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:20241: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:20211: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20243: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20299,16 +20331,16 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_utf8 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:20302: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20334: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 20306 "configure"
+#line 20338 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
 int
-main ()
+main (void)
 {
 putwc(0,0);
   ;
@@ -20316,21 +20348,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20322: \$? = $ac_status" >&5
+  echo "$as_me:20354: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20328: \$? = $ac_status" >&5
+  echo "$as_me:20360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:20333: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20365: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20348,7 +20380,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:20351: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20383: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -20423,18 +20455,18 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_utf8 ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:20426: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20458: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lutf8  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 20432 "configure"
+#line 20464 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
 int
-main ()
+main (void)
 {
 putwc(0,0);
   ;
@@ -20442,21 +20474,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20448: \$? = $ac_status" >&5
+  echo "$as_me:20480: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20454: \$? = $ac_status" >&5
+  echo "$as_me:20486: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:20459: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20491: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -20498,7 +20530,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20501: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:20533: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -20533,11 +20565,11 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20536 "configure"
+#line 20568 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -20545,16 +20577,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20551: \$? = $ac_status" >&5
+  echo "$as_me:20583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20557: \$? = $ac_status" >&5
+  echo "$as_me:20589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20571,7 +20603,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:20574: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20606: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20607,7 +20639,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:20610: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20642: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -20637,13 +20669,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:20640: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:20672: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:20643: result: yes" >&5
+		echo "$as_me:20675: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:20646: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:20678: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -20669,11 +20701,11 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20672 "configure"
+#line 20704 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
   ;
@@ -20681,37 +20713,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20687: \$? = $ac_status" >&5
+  echo "$as_me:20719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20693: \$? = $ac_status" >&5
+  echo "$as_me:20725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20699 "configure"
+#line 20731 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20709: \$? = $ac_status" >&5
+  echo "$as_me:20741: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20714: \$? = $ac_status" >&5
+  echo "$as_me:20746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -20728,7 +20760,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:20731: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:20763: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -20746,7 +20778,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:20749: result: no" >&5
+		echo "$as_me:20781: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -20762,7 +20794,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:20765: checking for $ac_word" >&5
+echo "$as_me:20797: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20777,7 +20809,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:20780: found $ac_dir/$ac_word" >&5
+echo "$as_me:20812: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20785,10 +20817,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20788: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20820: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20791: result: no" >&5
+  echo "$as_me:20823: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20801,7 +20833,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20804: checking for $ac_word" >&5
+echo "$as_me:20836: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20816,7 +20848,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:20819: found $ac_dir/$ac_word" >&5
+echo "$as_me:20851: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20824,10 +20856,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:20827: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:20859: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20830: result: no" >&5
+  echo "$as_me:20862: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20860,7 +20892,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20863: checking if we have identified curses headers" >&5
+echo "$as_me:20895: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20872,11 +20904,11 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20875 "configure"
+#line 20907 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
-main ()
+main (void)
 {
 initscr(); tgoto("?", 0,0)
   ;
@@ -20884,16 +20916,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20890: \$? = $ac_status" >&5
+  echo "$as_me:20922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20896: \$? = $ac_status" >&5
+  echo "$as_me:20928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20904,11 +20936,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20907: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20939: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:20911: error: No curses header-files found" >&5
+	{ { echo "$as_me:20943: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20918,23 +20950,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20921: checking for $ac_header" >&5
+echo "$as_me:20953: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20927 "configure"
+#line 20959 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20931: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20963: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20937: \$? = $ac_status" >&5
+  echo "$as_me:20969: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20953,7 +20985,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20956: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20988: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -21006,11 +21038,11 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21009 "configure"
+#line 21041 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -21018,16 +21050,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21024: \$? = $ac_status" >&5
+  echo "$as_me:21056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21030: \$? = $ac_status" >&5
+  echo "$as_me:21062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21044,7 +21076,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21047: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21079: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21063,7 +21095,7 @@ fi
 
 }
 
-echo "$as_me:21066: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:21098: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21075,12 +21107,12 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21078 "configure"
+#line 21110 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
 int
-main ()
+main (void)
 {
 
 #ifdef NCURSES_VERSION
@@ -21099,16 +21131,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21105: \$? = $ac_status" >&5
+  echo "$as_me:21137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21111: \$? = $ac_status" >&5
+  echo "$as_me:21143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -21123,14 +21155,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:21126: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:21158: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:21133: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:21165: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21248,11 +21280,11 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21251 "configure"
+#line 21283 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -21260,16 +21292,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21295: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21266: \$? = $ac_status" >&5
+  echo "$as_me:21298: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21272: \$? = $ac_status" >&5
+  echo "$as_me:21304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21286,7 +21318,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21289: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21321: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21309,12 +21341,12 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21312 "configure"
+#line 21344 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
 int
-main ()
+main (void)
 {
 
 #ifdef NCURSES_VERSION
@@ -21333,16 +21365,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21339: \$? = $ac_status" >&5
+  echo "$as_me:21371: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21345: \$? = $ac_status" >&5
+  echo "$as_me:21377: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -21363,12 +21395,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21366: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21398: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:21371: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:21403: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -21401,11 +21433,11 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21404 "configure"
+#line 21436 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -21413,16 +21445,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21419: \$? = $ac_status" >&5
+  echo "$as_me:21451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21425: \$? = $ac_status" >&5
+  echo "$as_me:21457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21439,7 +21471,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:21442: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21474: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21487,7 +21519,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21490: checking for terminfo header" >&5
+echo "$as_me:21522: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21505,14 +21537,14 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21508 "configure"
+#line 21540 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
-main ()
+main (void)
 {
 int x = auto_left_margin
   ;
@@ -21520,16 +21552,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21526: \$? = $ac_status" >&5
+  echo "$as_me:21558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21532: \$? = $ac_status" >&5
+  echo "$as_me:21564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21545,7 +21577,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21548: result: $cf_cv_term_header" >&5
+echo "$as_me:21580: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21583,7 +21615,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:21586: checking for ncurses version" >&5
+echo "$as_me:21618: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21609,10 +21641,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21612: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21644: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21615: \$? = $ac_status" >&5
+  echo "$as_me:21647: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -21622,12 +21654,12 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21625 "configure"
+#line 21657 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
-int main()
+int main(void)
 {
 	FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
@@ -21647,15 +21679,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21653: \$? = $ac_status" >&5
+  echo "$as_me:21685: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21658: \$? = $ac_status" >&5
+  echo "$as_me:21690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21669,7 +21701,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:21672: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21704: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -21682,7 +21714,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21685: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21717: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21690,7 +21722,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21693 "configure"
+#line 21725 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21701,7 +21733,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char Gpm_Open ();
 int
-main ()
+main (void)
 {
 Gpm_Open ();
   ;
@@ -21709,16 +21741,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21715: \$? = $ac_status" >&5
+  echo "$as_me:21747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21721: \$? = $ac_status" >&5
+  echo "$as_me:21753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21729,10 +21761,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21732: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21764: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:21735: checking for initscr in -lgpm" >&5
+  echo "$as_me:21767: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21740,7 +21772,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21743 "configure"
+#line 21775 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21751,7 +21783,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -21759,16 +21791,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21765: \$? = $ac_status" >&5
+  echo "$as_me:21797: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21771: \$? = $ac_status" >&5
+  echo "$as_me:21803: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21779,7 +21811,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21782: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21814: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -21794,7 +21826,7 @@ case $host_os in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:21797: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21829: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21802,7 +21834,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21805 "configure"
+#line 21837 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21813,7 +21845,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char tgoto ();
 int
-main ()
+main (void)
 {
 tgoto ();
   ;
@@ -21821,16 +21853,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21827: \$? = $ac_status" >&5
+  echo "$as_me:21859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21833: \$? = $ac_status" >&5
+  echo "$as_me:21865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21841,7 +21873,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21844: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21876: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -21890,13 +21922,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21893: checking for initscr" >&5
+	echo "$as_me:21925: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21899 "configure"
+#line 21931 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21911,7 +21943,7 @@ char initscr ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -21927,16 +21959,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21933: \$? = $ac_status" >&5
+  echo "$as_me:21965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21939: \$? = $ac_status" >&5
+  echo "$as_me:21971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21946,22 +21978,22 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21949: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21981: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:21956: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:21988: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21960 "configure"
+#line 21992 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr()
   ;
@@ -21969,25 +22001,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22004: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21975: \$? = $ac_status" >&5
+  echo "$as_me:22007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21981: \$? = $ac_status" >&5
+  echo "$as_me:22013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21983: result: yes" >&5
+  echo "$as_me:22015: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21990: result: no" >&5
+echo "$as_me:22022: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22055,15 +22087,15 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22058: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:22090: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 22062 "configure"
+#line 22094 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr()
   ;
@@ -22071,25 +22103,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22106: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22077: \$? = $ac_status" >&5
+  echo "$as_me:22109: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22083: \$? = $ac_status" >&5
+  echo "$as_me:22115: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22085: result: yes" >&5
+  echo "$as_me:22117: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22092: result: no" >&5
+echo "$as_me:22124: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22104,7 +22136,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22107: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:22139: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22112,7 +22144,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:22115: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:22147: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -22122,11 +22154,11 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22125 "configure"
+#line 22157 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
   ;
@@ -22134,23 +22166,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22140: \$? = $ac_status" >&5
+  echo "$as_me:22172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22146: \$? = $ac_status" >&5
+  echo "$as_me:22178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22148: result: yes" >&5
+  echo "$as_me:22180: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22153: result: no" >&5
+echo "$as_me:22185: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -22176,13 +22208,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:22179: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:22211: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:22182: result: yes" >&5
+		echo "$as_me:22214: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:22185: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:22217: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -22208,11 +22240,11 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22211 "configure"
+#line 22243 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
   ;
@@ -22220,37 +22252,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22226: \$? = $ac_status" >&5
+  echo "$as_me:22258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22232: \$? = $ac_status" >&5
+  echo "$as_me:22264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22238 "configure"
+#line 22270 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22248: \$? = $ac_status" >&5
+  echo "$as_me:22280: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22253: \$? = $ac_status" >&5
+  echo "$as_me:22285: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -22267,7 +22299,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:22270: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:22302: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -22285,7 +22317,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:22288: result: no" >&5
+		echo "$as_me:22320: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -22301,7 +22333,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:22304: checking for $ac_word" >&5
+echo "$as_me:22336: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22316,7 +22348,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:22319: found $ac_dir/$ac_word" >&5
+echo "$as_me:22351: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -22324,10 +22356,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:22327: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:22359: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:22330: result: no" >&5
+  echo "$as_me:22362: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22340,7 +22372,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:22343: checking for $ac_word" >&5
+echo "$as_me:22375: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22355,7 +22387,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:22358: found $ac_dir/$ac_word" >&5
+echo "$as_me:22390: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -22363,10 +22395,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:22366: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:22398: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:22369: result: no" >&5
+  echo "$as_me:22401: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22399,7 +22431,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:22402: checking if we have identified curses headers" >&5
+echo "$as_me:22434: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22411,11 +22443,11 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22414 "configure"
+#line 22446 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
-main ()
+main (void)
 {
 initscr(); tgoto("?", 0,0)
   ;
@@ -22423,16 +22455,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22429: \$? = $ac_status" >&5
+  echo "$as_me:22461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22435: \$? = $ac_status" >&5
+  echo "$as_me:22467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -22443,11 +22475,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22446: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:22478: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:22450: error: No curses header-files found" >&5
+	{ { echo "$as_me:22482: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22457,23 +22489,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22460: checking for $ac_header" >&5
+echo "$as_me:22492: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22466 "configure"
+#line 22498 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22470: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22502: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22476: \$? = $ac_status" >&5
+  echo "$as_me:22508: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22492,7 +22524,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22495: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22527: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -22545,11 +22577,11 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22548 "configure"
+#line 22580 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -22557,16 +22589,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22592: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22563: \$? = $ac_status" >&5
+  echo "$as_me:22595: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22569: \$? = $ac_status" >&5
+  echo "$as_me:22601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22583,7 +22615,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:22586: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22618: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22602,7 +22634,7 @@ fi
 
 }
 
-echo "$as_me:22605: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:22637: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22614,12 +22646,12 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22617 "configure"
+#line 22649 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
 int
-main ()
+main (void)
 {
 
 #ifdef NCURSES_VERSION
@@ -22638,16 +22670,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22641: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22644: \$? = $ac_status" >&5
+  echo "$as_me:22676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22650: \$? = $ac_status" >&5
+  echo "$as_me:22682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -22662,14 +22694,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:22665: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22697: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:22672: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22704: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22787,11 +22819,11 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22790 "configure"
+#line 22822 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -22799,16 +22831,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22805: \$? = $ac_status" >&5
+  echo "$as_me:22837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22811: \$? = $ac_status" >&5
+  echo "$as_me:22843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22825,7 +22857,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:22828: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22860: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22848,12 +22880,12 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22851 "configure"
+#line 22883 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
 int
-main ()
+main (void)
 {
 
 #ifdef NCURSES_VERSION
@@ -22872,16 +22904,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22878: \$? = $ac_status" >&5
+  echo "$as_me:22910: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22884: \$? = $ac_status" >&5
+  echo "$as_me:22916: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -22902,12 +22934,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22905: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22937: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:22910: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22942: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -22940,11 +22972,11 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22943 "configure"
+#line 22975 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -22952,16 +22984,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22958: \$? = $ac_status" >&5
+  echo "$as_me:22990: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:22996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22978,7 +23010,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:22981: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23013: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23026,7 +23058,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:23029: checking for terminfo header" >&5
+echo "$as_me:23061: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23044,14 +23076,14 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 23047 "configure"
+#line 23079 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
-main ()
+main (void)
 {
 int x = auto_left_margin
   ;
@@ -23059,16 +23091,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23065: \$? = $ac_status" >&5
+  echo "$as_me:23097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23071: \$? = $ac_status" >&5
+  echo "$as_me:23103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -23084,7 +23116,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23087: result: $cf_cv_term_header" >&5
+echo "$as_me:23119: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -23122,7 +23154,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:23125: checking for ncurses version" >&5
+echo "$as_me:23157: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23148,10 +23180,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:23151: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:23183: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:23154: \$? = $ac_status" >&5
+  echo "$as_me:23186: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -23161,12 +23193,12 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23164 "configure"
+#line 23196 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
-int main()
+int main(void)
 {
 	FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
@@ -23186,15 +23218,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23189: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23221: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23192: \$? = $ac_status" >&5
+  echo "$as_me:23224: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23197: \$? = $ac_status" >&5
+  echo "$as_me:23229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -23208,7 +23240,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:23211: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:23243: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -23221,7 +23253,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:23224: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:23256: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23229,7 +23261,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23232 "configure"
+#line 23264 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23240,7 +23272,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char Gpm_Open ();
 int
-main ()
+main (void)
 {
 Gpm_Open ();
   ;
@@ -23248,16 +23280,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23254: \$? = $ac_status" >&5
+  echo "$as_me:23286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23260: \$? = $ac_status" >&5
+  echo "$as_me:23292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -23268,10 +23300,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23271: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:23303: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:23274: checking for initscr in -lgpm" >&5
+  echo "$as_me:23306: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23279,7 +23311,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23282 "configure"
+#line 23314 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23290,7 +23322,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -23298,16 +23330,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23304: \$? = $ac_status" >&5
+  echo "$as_me:23336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23310: \$? = $ac_status" >&5
+  echo "$as_me:23342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -23318,7 +23350,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23321: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:23353: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -23333,7 +23365,7 @@ case $host_os in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:23336: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:23368: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23341,7 +23373,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23344 "configure"
+#line 23376 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23352,7 +23384,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char tgoto ();
 int
-main ()
+main (void)
 {
 tgoto ();
   ;
@@ -23360,16 +23392,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23366: \$? = $ac_status" >&5
+  echo "$as_me:23398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23372: \$? = $ac_status" >&5
+  echo "$as_me:23404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -23380,7 +23412,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23383: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:23415: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -23429,13 +23461,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:23432: checking for initscr" >&5
+	echo "$as_me:23464: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23438 "configure"
+#line 23470 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -23450,7 +23482,7 @@ char initscr ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -23466,16 +23498,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23472: \$? = $ac_status" >&5
+  echo "$as_me:23504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23478: \$? = $ac_status" >&5
+  echo "$as_me:23510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -23485,22 +23517,22 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23488: result: $ac_cv_func_initscr" >&5
+echo "$as_me:23520: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:23495: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:23527: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23499 "configure"
+#line 23531 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr()
   ;
@@ -23508,25 +23540,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23543: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23514: \$? = $ac_status" >&5
+  echo "$as_me:23546: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23520: \$? = $ac_status" >&5
+  echo "$as_me:23552: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23522: result: yes" >&5
+  echo "$as_me:23554: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23529: result: no" >&5
+echo "$as_me:23561: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23594,15 +23626,15 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23597: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:23629: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 23601 "configure"
+#line 23633 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr()
   ;
@@ -23610,25 +23642,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23616: \$? = $ac_status" >&5
+  echo "$as_me:23648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23622: \$? = $ac_status" >&5
+  echo "$as_me:23654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23624: result: yes" >&5
+  echo "$as_me:23656: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23631: result: no" >&5
+echo "$as_me:23663: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23643,7 +23675,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23646: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:23678: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23651,7 +23683,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:23654: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:23686: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -23661,11 +23693,11 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23664 "configure"
+#line 23696 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
   ;
@@ -23673,23 +23705,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23679: \$? = $ac_status" >&5
+  echo "$as_me:23711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23685: \$? = $ac_status" >&5
+  echo "$as_me:23717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23687: result: yes" >&5
+  echo "$as_me:23719: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23692: result: no" >&5
+echo "$as_me:23724: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -23721,7 +23753,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:23724: checking for slang header file" >&5
+echo "$as_me:23756: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23729,11 +23761,11 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23732 "configure"
+#line 23764 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 printf("%s\n", SLANG_VERSION)
   ;
@@ -23741,16 +23773,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23747: \$? = $ac_status" >&5
+  echo "$as_me:23779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23753: \$? = $ac_status" >&5
+  echo "$as_me:23785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -23855,7 +23887,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23858: result: $cf_cv_slang_header" >&5
+echo "$as_me:23890: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -23896,11 +23928,11 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23899 "configure"
+#line 23931 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -23908,16 +23940,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23914: \$? = $ac_status" >&5
+  echo "$as_me:23946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23920: \$? = $ac_status" >&5
+  echo "$as_me:23952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23934,7 +23966,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:23937: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23969: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23966,11 +23998,11 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23969 "configure"
+#line 24001 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 char *x=(char*)tgoto("",0,0)
   ;
@@ -23978,23 +24010,23 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23984: \$? = $ac_status" >&5
+  echo "$as_me:24016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23990: \$? = $ac_status" >&5
+  echo "$as_me:24022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23993 "configure"
+#line 24025 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 int x=tigetstr("")
   ;
@@ -24002,16 +24034,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24008: \$? = $ac_status" >&5
+  echo "$as_me:24040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24014: \$? = $ac_status" >&5
+  echo "$as_me:24046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24022,7 +24054,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me:-configure}:24025: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24057: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24037,14 +24069,14 @@ if test "$cf_cv_termlib" = none; then
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:24040: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24072: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 24043 "configure"
+#line 24075 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 int x=$cf_func("")
   ;
@@ -24052,16 +24084,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24058: \$? = $ac_status" >&5
+  echo "$as_me:24090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24064: \$? = $ac_status" >&5
+  echo "$as_me:24096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24070,7 +24102,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24073: result: $cf_result" >&5
+			echo "$as_me:24105: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24087,7 +24119,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:24090: checking for initscr in -lcurses" >&5
+	echo "$as_me:24122: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24095,7 +24127,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24098 "configure"
+#line 24130 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24106,7 +24138,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -24114,16 +24146,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24120: \$? = $ac_status" >&5
+  echo "$as_me:24152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24126: \$? = $ac_status" >&5
+  echo "$as_me:24158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24134,7 +24166,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24137: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24169: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
 
@@ -24156,7 +24188,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:24159: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24191: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24164,7 +24196,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24167 "configure"
+#line 24199 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24175,7 +24207,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char tgoto ();
 int
-main ()
+main (void)
 {
 tgoto ();
   ;
@@ -24183,16 +24215,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24218: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24189: \$? = $ac_status" >&5
+  echo "$as_me:24221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24195: \$? = $ac_status" >&5
+  echo "$as_me:24227: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24203,7 +24235,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24206: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24238: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
 
@@ -24230,20 +24262,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24233: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24265: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:24240: checking for acos" >&5
+echo "$as_me:24272: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24246 "configure"
+#line 24278 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24258,7 +24290,7 @@ char acos ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -24274,16 +24306,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24280: \$? = $ac_status" >&5
+  echo "$as_me:24312: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24286: \$? = $ac_status" >&5
+  echo "$as_me:24318: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24293,13 +24325,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24296: result: $ac_cv_func_acos" >&5
+echo "$as_me:24328: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:24302: checking for acos in -lm" >&5
+echo "$as_me:24334: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24307,7 +24339,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24310 "configure"
+#line 24342 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24318,7 +24350,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char acos ();
 int
-main ()
+main (void)
 {
 acos ();
   ;
@@ -24326,16 +24358,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24332: \$? = $ac_status" >&5
+  echo "$as_me:24364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24338: \$? = $ac_status" >&5
+  echo "$as_me:24370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24346,7 +24378,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24349: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24381: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -24372,13 +24404,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24375: checking for v_init" >&5
+	echo "$as_me:24407: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24381 "configure"
+#line 24413 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24393,7 +24425,7 @@ char v_init ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -24409,16 +24441,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24415: \$? = $ac_status" >&5
+  echo "$as_me:24447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24421: \$? = $ac_status" >&5
+  echo "$as_me:24453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24428,22 +24460,22 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24431: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24463: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:24438: checking for v_init in -lvideo" >&5
+		echo "$as_me:24470: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24442 "configure"
+#line 24474 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
-main ()
+main (void)
 {
 v_init()
   ;
@@ -24451,25 +24483,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24454: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24457: \$? = $ac_status" >&5
+  echo "$as_me:24489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24463: \$? = $ac_status" >&5
+  echo "$as_me:24495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24465: result: yes" >&5
+  echo "$as_me:24497: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24472: result: no" >&5
+echo "$as_me:24504: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24537,15 +24569,15 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24540: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:24572: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 24544 "configure"
+#line 24576 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
-main ()
+main (void)
 {
 v_init()
   ;
@@ -24553,25 +24585,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24559: \$? = $ac_status" >&5
+  echo "$as_me:24591: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24565: \$? = $ac_status" >&5
+  echo "$as_me:24597: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24567: result: yes" >&5
+  echo "$as_me:24599: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24574: result: no" >&5
+echo "$as_me:24606: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24586,7 +24618,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24589: error: Cannot link video library" >&5
+	{ { echo "$as_me:24621: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24596,13 +24628,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:24599: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24631: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24605 "configure"
+#line 24637 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24617,7 +24649,7 @@ char SLtt_get_screen_size ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -24633,16 +24665,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24636: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24639: \$? = $ac_status" >&5
+  echo "$as_me:24671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24645: \$? = $ac_status" >&5
+  echo "$as_me:24677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24652,22 +24684,22 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24655: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24687: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:24662: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:24694: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24666 "configure"
+#line 24698 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -24675,25 +24707,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24710: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24681: \$? = $ac_status" >&5
+  echo "$as_me:24713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24687: \$? = $ac_status" >&5
+  echo "$as_me:24719: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24689: result: yes" >&5
+  echo "$as_me:24721: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24696: result: no" >&5
+echo "$as_me:24728: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24761,15 +24793,15 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24764: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:24796: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 24768 "configure"
+#line 24800 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -24777,25 +24809,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24783: \$? = $ac_status" >&5
+  echo "$as_me:24815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24789: \$? = $ac_status" >&5
+  echo "$as_me:24821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24791: result: yes" >&5
+  echo "$as_me:24823: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24798: result: no" >&5
+echo "$as_me:24830: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24810,13 +24842,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24813: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24845: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:24819: checking if we can link slang without termcap" >&5
+echo "$as_me:24851: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -24825,11 +24857,11 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 24828 "configure"
+#line 24860 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -24837,16 +24869,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24843: \$? = $ac_status" >&5
+  echo "$as_me:24875: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24849: \$? = $ac_status" >&5
+  echo "$as_me:24881: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24855,13 +24887,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24858: result: $cf_result" >&5
+echo "$as_me:24890: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:24864: checking for slang2 header file" >&5
+echo "$as_me:24896: checking for slang2 header file" >&5
 echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
 if test "${cf_cv_slang2_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24869,11 +24901,11 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24872 "configure"
+#line 24904 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 printf("%s\n", SLANG_VERSION)
   ;
@@ -24881,16 +24913,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24887: \$? = $ac_status" >&5
+  echo "$as_me:24919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24893: \$? = $ac_status" >&5
+  echo "$as_me:24925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24995,7 +25027,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24998: result: $cf_cv_slang2_header" >&5
+echo "$as_me:25030: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -25036,11 +25068,11 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 25039 "configure"
+#line 25071 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -25048,16 +25080,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25054: \$? = $ac_status" >&5
+  echo "$as_me:25086: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25060: \$? = $ac_status" >&5
+  echo "$as_me:25092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25074,7 +25106,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:25077: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25109: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25106,11 +25138,11 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 25109 "configure"
+#line 25141 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 char *x=(char*)tgoto("",0,0)
   ;
@@ -25118,23 +25150,23 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25153: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25124: \$? = $ac_status" >&5
+  echo "$as_me:25156: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25130: \$? = $ac_status" >&5
+  echo "$as_me:25162: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 25133 "configure"
+#line 25165 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 int x=tigetstr("")
   ;
@@ -25142,16 +25174,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25148: \$? = $ac_status" >&5
+  echo "$as_me:25180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25154: \$? = $ac_status" >&5
+  echo "$as_me:25186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -25162,7 +25194,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me:-configure}:25165: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:25197: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -25177,14 +25209,14 @@ if test "$cf_cv_termlib" = none; then
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:25180: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:25212: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 25183 "configure"
+#line 25215 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 int x=$cf_func("")
   ;
@@ -25192,16 +25224,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25198: \$? = $ac_status" >&5
+  echo "$as_me:25230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25204: \$? = $ac_status" >&5
+  echo "$as_me:25236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25210,7 +25242,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:25213: result: $cf_result" >&5
+			echo "$as_me:25245: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -25227,7 +25259,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:25230: checking for initscr in -lcurses" >&5
+	echo "$as_me:25262: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25235,7 +25267,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25238 "configure"
+#line 25270 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25246,7 +25278,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -25254,16 +25286,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25260: \$? = $ac_status" >&5
+  echo "$as_me:25292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25266: \$? = $ac_status" >&5
+  echo "$as_me:25298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -25274,7 +25306,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25277: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:25309: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
 
@@ -25296,7 +25328,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:25299: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:25331: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25304,7 +25336,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25307 "configure"
+#line 25339 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25315,7 +25347,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char tgoto ();
 int
-main ()
+main (void)
 {
 tgoto ();
   ;
@@ -25323,16 +25355,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25329: \$? = $ac_status" >&5
+  echo "$as_me:25361: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25335: \$? = $ac_status" >&5
+  echo "$as_me:25367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -25343,7 +25375,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25346: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:25378: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
 
@@ -25370,20 +25402,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:25373: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:25405: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:25380: checking for acos" >&5
+echo "$as_me:25412: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25386 "configure"
+#line 25418 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -25398,7 +25430,7 @@ char acos ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -25414,16 +25446,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25449: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25420: \$? = $ac_status" >&5
+  echo "$as_me:25452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25426: \$? = $ac_status" >&5
+  echo "$as_me:25458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -25433,13 +25465,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25436: result: $ac_cv_func_acos" >&5
+echo "$as_me:25468: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:25442: checking for acos in -lm" >&5
+echo "$as_me:25474: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25447,7 +25479,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25450 "configure"
+#line 25482 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25458,7 +25490,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char acos ();
 int
-main ()
+main (void)
 {
 acos ();
   ;
@@ -25466,16 +25498,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25472: \$? = $ac_status" >&5
+  echo "$as_me:25504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25478: \$? = $ac_status" >&5
+  echo "$as_me:25510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -25486,7 +25518,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25489: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:25521: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -25512,13 +25544,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:25515: checking for v_init" >&5
+	echo "$as_me:25547: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25521 "configure"
+#line 25553 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -25533,7 +25565,7 @@ char v_init ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -25549,16 +25581,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25555: \$? = $ac_status" >&5
+  echo "$as_me:25587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25561: \$? = $ac_status" >&5
+  echo "$as_me:25593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -25568,22 +25600,22 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25571: result: $ac_cv_func_v_init" >&5
+echo "$as_me:25603: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:25578: checking for v_init in -lvideo" >&5
+		echo "$as_me:25610: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25582 "configure"
+#line 25614 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
-main ()
+main (void)
 {
 v_init()
   ;
@@ -25591,25 +25623,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25597: \$? = $ac_status" >&5
+  echo "$as_me:25629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25603: \$? = $ac_status" >&5
+  echo "$as_me:25635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25605: result: yes" >&5
+  echo "$as_me:25637: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25612: result: no" >&5
+echo "$as_me:25644: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25677,15 +25709,15 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25680: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:25712: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 25684 "configure"
+#line 25716 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
-main ()
+main (void)
 {
 v_init()
   ;
@@ -25693,25 +25725,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25699: \$? = $ac_status" >&5
+  echo "$as_me:25731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25705: \$? = $ac_status" >&5
+  echo "$as_me:25737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25707: result: yes" >&5
+  echo "$as_me:25739: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25714: result: no" >&5
+echo "$as_me:25746: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25726,7 +25758,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25729: error: Cannot link video library" >&5
+	{ { echo "$as_me:25761: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25736,13 +25768,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:25739: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:25771: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25745 "configure"
+#line 25777 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -25757,7 +25789,7 @@ char SLtt_get_screen_size ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -25773,16 +25805,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25779: \$? = $ac_status" >&5
+  echo "$as_me:25811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25785: \$? = $ac_status" >&5
+  echo "$as_me:25817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -25792,22 +25824,22 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25795: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:25827: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:25802: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25834: checking for SLtt_get_screen_size in -lslang2" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
 		LIBS="-lslang2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25806 "configure"
+#line 25838 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -25815,25 +25847,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25850: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25821: \$? = $ac_status" >&5
+  echo "$as_me:25853: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25827: \$? = $ac_status" >&5
+  echo "$as_me:25859: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25829: result: yes" >&5
+  echo "$as_me:25861: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25836: result: no" >&5
+echo "$as_me:25868: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25901,15 +25933,15 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25904: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25936: checking for -lslang2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 25908 "configure"
+#line 25940 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -25917,25 +25949,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25952: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25923: \$? = $ac_status" >&5
+  echo "$as_me:25955: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25929: \$? = $ac_status" >&5
+  echo "$as_me:25961: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25931: result: yes" >&5
+  echo "$as_me:25963: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25938: result: no" >&5
+echo "$as_me:25970: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25950,13 +25982,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25953: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:25985: error: Cannot link slang2 library" >&5
 echo "$as_me: error: Cannot link slang2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:25959: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25991: checking if we can link slang2 without termcap" >&5
 echo $ECHO_N "checking if we can link slang2 without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -25965,11 +25997,11 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25968 "configure"
+#line 26000 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -25977,16 +26009,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25983: \$? = $ac_status" >&5
+  echo "$as_me:26015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25989: \$? = $ac_status" >&5
+  echo "$as_me:26021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25995,12 +26027,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25998: result: $cf_result" >&5
+echo "$as_me:26030: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:26003: error: cannot find slang headers" >&5
+		{ { echo "$as_me:26035: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26008,18 +26040,18 @@ fi
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:26011: checking if we must define UTF8" >&5
+echo "$as_me:26043: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26018 "configure"
+#line 26050 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -26027,16 +26059,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26033: \$? = $ac_status" >&5
+  echo "$as_me:26065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26039: \$? = $ac_status" >&5
+  echo "$as_me:26071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -26044,13 +26076,13 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26047 "configure"
+#line 26079 "configure"
 #include "confdefs.h"
 
 #define UTF8
 #include <slang.h>
 int
-main ()
+main (void)
 {
 SLtt_get_screen_size()
   ;
@@ -26058,16 +26090,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26064: \$? = $ac_status" >&5
+  echo "$as_me:26096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26070: \$? = $ac_status" >&5
+  echo "$as_me:26102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -26080,7 +26112,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:26083: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:26115: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -26091,18 +26123,18 @@ EOF
 
 fi
 
-echo "$as_me:26094: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:26126: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 26101 "configure"
+#line 26133 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
-main ()
+main (void)
 {
 
 #ifdef REAL_UNIX_SYSTEM
@@ -26117,16 +26149,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26123: \$? = $ac_status" >&5
+  echo "$as_me:26155: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26129: \$? = $ac_status" >&5
+  echo "$as_me:26161: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -26137,25 +26169,25 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26140: result: $cf_cv_slang_unix" >&5
+echo "$as_me:26172: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes &&
 cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
 EOF
 
-	echo "$as_me:26147: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:26179: checking for SLsmg_Color_Type" >&5
 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26153 "configure"
+#line 26185 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
 int
-main ()
+main (void)
 {
 if ((SLsmg_Color_Type *) 0)
   return 0;
@@ -26166,16 +26198,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26172: \$? = $ac_status" >&5
+  echo "$as_me:26204: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26178: \$? = $ac_status" >&5
+  echo "$as_me:26210: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -26185,7 +26217,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26188: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:26220: result: $ac_cv_type_SLsmg_Color_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
 if test $ac_cv_type_SLsmg_Color_Type = yes; then
   ac_cv_type_SLsmg_Color_Type=yes
@@ -26201,18 +26233,18 @@ EOF
 
 fi
 
-	echo "$as_me:26204: checking for SLtt_Char_Type" >&5
+	echo "$as_me:26236: checking for SLtt_Char_Type" >&5
 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26210 "configure"
+#line 26242 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
 int
-main ()
+main (void)
 {
 if ((SLtt_Char_Type *) 0)
   return 0;
@@ -26223,16 +26255,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26226: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26258: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26229: \$? = $ac_status" >&5
+  echo "$as_me:26261: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26235: \$? = $ac_status" >&5
+  echo "$as_me:26267: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -26242,7 +26274,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26245: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:26277: result: $ac_cv_type_SLtt_Char_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
 if test $ac_cv_type_SLtt_Char_Type = yes; then
   ac_cv_type_SLtt_Char_Type=yes
@@ -26262,18 +26294,18 @@ fi
 	;;
 esac
 
-echo "$as_me:26265: checking for chtype typedef" >&5
+echo "$as_me:26297: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26272 "configure"
+#line 26304 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 chtype foo
   ;
@@ -26281,16 +26313,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26316: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26287: \$? = $ac_status" >&5
+  echo "$as_me:26319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26293: \$? = $ac_status" >&5
+  echo "$as_me:26325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -26300,7 +26332,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26303: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:26335: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -26308,18 +26340,18 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:26311: checking if chtype is scalar or struct" >&5
+	echo "$as_me:26343: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 26318 "configure"
+#line 26350 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 chtype foo; long x = foo
   ;
@@ -26327,16 +26359,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26333: \$? = $ac_status" >&5
+  echo "$as_me:26365: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26339: \$? = $ac_status" >&5
+  echo "$as_me:26371: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -26346,7 +26378,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26349: result: $cf_cv_chtype_type" >&5
+echo "$as_me:26381: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -26357,7 +26389,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26360: checking if you want the wide-curses features" >&5
+echo "$as_me:26392: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -26374,10 +26406,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:26377: result: $use_wide_curses" >&5
+echo "$as_me:26409: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:26380: checking if color-style code should be used" >&5
+echo "$as_me:26412: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -26397,7 +26429,7 @@ fi;
 
 case $use_color_style in
 (no)
-	echo "$as_me:26400: result: no" >&5
+	echo "$as_me:26432: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -26407,10 +26439,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:26410: result: yes" >&5
+	echo "$as_me:26442: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:26413: checking for location of style-sheet file" >&5
+	echo "$as_me:26445: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 
 # Check whether --with-lss-file or --without-lss-file was given.
@@ -26446,7 +26478,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26449: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26481: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26455,7 +26487,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:26458: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:26490: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -26468,7 +26500,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26471: checking for the default configuration-file" >&5
+echo "$as_me:26503: checking for the default configuration-file" >&5
 echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
 
 # Check whether --with-cfg-file or --without-cfg-file was given.
@@ -26504,7 +26536,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26507: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26539: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26513,7 +26545,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:26516: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:26548: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -26522,7 +26554,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:26525: checking for the default configuration-path" >&5
+echo "$as_me:26557: checking for the default configuration-path" >&5
 echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6
 
 # Check whether --with-cfg-path or --without-cfg-path was given.
@@ -26558,7 +26590,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26561: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26593: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26567,7 +26599,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:26570: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:26602: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -26577,7 +26609,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:26580: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:26612: checking if htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -26594,7 +26626,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:26597: result: $use_htmlized_cfg" >&5
+echo "$as_me:26629: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -26602,7 +26634,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:26605: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:26637: checking if local doc directory should be linked to help page" >&5
 echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
 
 # Check whether --enable-local-docs or --disable-local-docs was given.
@@ -26619,7 +26651,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:26622: result: $use_local_docs" >&5
+echo "$as_me:26654: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -26627,7 +26659,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:26630: checking for MIME library directory" >&5
+echo "$as_me:26662: checking for MIME library directory" >&5
 echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
 
 # Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -26663,7 +26695,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26666: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26698: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26672,7 +26704,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:26675: result: $MIME_LIBDIR" >&5
+echo "$as_me:26707: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -26680,7 +26712,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:26683: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:26715: checking if locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -26697,7 +26729,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:26700: result: $use_locale_charset" >&5
+echo "$as_me:26732: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -26706,7 +26738,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:26709: checking if you want only a few charsets" >&5
+echo "$as_me:26741: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -26718,7 +26750,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:26721: result: yes" >&5
+	echo "$as_me:26753: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -26732,7 +26764,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me:-configure}:26735: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:26767: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
 
 	fi
 	cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -26759,28 +26791,28 @@ echo "${as_me:-configure}:26735: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:26762: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26794: testing found $cf_charset ..." 1>&5
 
 			CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
 		else
 			test -n "$verbose" && echo "	not found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:26768: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26800: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:26773: result: no" >&5
+	echo "$as_me:26805: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26777: checking for ANSI C header files" >&5
+echo "$as_me:26809: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26783 "configure"
+#line 26815 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -26788,13 +26820,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:26791: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26823: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26797: \$? = $ac_status" >&5
+  echo "$as_me:26829: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26816,7 +26848,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 26819 "configure"
+#line 26851 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -26834,7 +26866,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 26837 "configure"
+#line 26869 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -26855,7 +26887,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26858 "configure"
+#line 26890 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -26870,7 +26902,7 @@ else
 
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
-main ()
+main (void)
 {
   int i;
   for (i = 0; i < 256; i++)
@@ -26881,15 +26913,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26887: \$? = $ac_status" >&5
+  echo "$as_me:26919: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26892: \$? = $ac_status" >&5
+  echo "$as_me:26924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26902,7 +26934,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:26905: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26937: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26912,20 +26944,20 @@ EOF
 
 fi
 
-echo "$as_me:26915: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26947: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26921 "configure"
+#line 26953 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
 
 int
-main ()
+main (void)
 {
 if ((struct tm *) 0)
 return 0;
@@ -26934,16 +26966,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26940: \$? = $ac_status" >&5
+  echo "$as_me:26972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26946: \$? = $ac_status" >&5
+  echo "$as_me:26978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26953,7 +26985,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26956: result: $ac_cv_header_time" >&5
+echo "$as_me:26988: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26966,19 +26998,19 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:26969: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:27001: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26975 "configure"
+#line 27007 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 
 int
-main ()
+main (void)
 {
 if ((DIR *) 0)
 return 0;
@@ -26987,16 +27019,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26993: \$? = $ac_status" >&5
+  echo "$as_me:27025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26999: \$? = $ac_status" >&5
+  echo "$as_me:27031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -27006,7 +27038,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27009: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27041: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -27019,7 +27051,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:27022: checking for opendir in -ldir" >&5
+  echo "$as_me:27054: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27027,7 +27059,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 27030 "configure"
+#line 27062 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27038,7 +27070,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char opendir ();
 int
-main ()
+main (void)
 {
 opendir ();
   ;
@@ -27046,16 +27078,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27052: \$? = $ac_status" >&5
+  echo "$as_me:27084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27058: \$? = $ac_status" >&5
+  echo "$as_me:27090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -27066,14 +27098,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27069: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:27101: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:27076: checking for opendir in -lx" >&5
+  echo "$as_me:27108: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27081,7 +27113,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 27084 "configure"
+#line 27116 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27092,7 +27124,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char opendir ();
 int
-main ()
+main (void)
 {
 opendir ();
   ;
@@ -27100,16 +27132,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27106: \$? = $ac_status" >&5
+  echo "$as_me:27138: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27112: \$? = $ac_status" >&5
+  echo "$as_me:27144: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -27120,7 +27152,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27123: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:27155: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -27148,23 +27180,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27151: checking for $ac_header" >&5
+echo "$as_me:27183: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27157 "configure"
+#line 27189 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27161: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27193: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:27167: \$? = $ac_status" >&5
+  echo "$as_me:27199: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27183,7 +27215,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27186: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27218: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -27193,14 +27225,14 @@ EOF
 fi
 done
 
-echo "$as_me:27196: checking termio.h and termios.h" >&5
+echo "$as_me:27228: checking termio.h and termios.h" >&5
 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
 if test "${cf_cv_termio_and_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 27203 "configure"
+#line 27235 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -27210,7 +27242,7 @@ else
 #include <termios.h>
 #endif
 int
-main ()
+main (void)
 {
 putchar (0x0a)
   ;
@@ -27218,16 +27250,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27224: \$? = $ac_status" >&5
+  echo "$as_me:27256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27230: \$? = $ac_status" >&5
+  echo "$as_me:27262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -27238,27 +27270,27 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27241: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:27273: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
 test $cf_cv_termio_and_termios = no &&
 cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:27248: checking for sigaction and structs" >&5
+echo "$as_me:27280: checking for sigaction and structs" >&5
 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
 if test "${cf_cv_func_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27255 "configure"
+#line 27287 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <signal.h>
 int
-main ()
+main (void)
 {
 struct sigaction act;
 	act.sa_handler = SIG_DFL;
@@ -27272,16 +27304,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27278: \$? = $ac_status" >&5
+  echo "$as_me:27310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27284: \$? = $ac_status" >&5
+  echo "$as_me:27316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -27292,7 +27324,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27295: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:27327: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -27302,23 +27334,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27305: checking for $ac_header" >&5
+echo "$as_me:27337: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27311 "configure"
+#line 27343 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27315: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27347: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:27321: \$? = $ac_status" >&5
+  echo "$as_me:27353: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27337,7 +27369,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27340: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27372: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -27358,23 +27390,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27361: checking for $ac_header" >&5
+echo "$as_me:27393: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27367 "configure"
+#line 27399 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27371: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27403: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:27377: \$? = $ac_status" >&5
+  echo "$as_me:27409: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27393,7 +27425,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27396: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27428: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -27406,23 +27438,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27409: checking for $ac_header" >&5
+echo "$as_me:27441: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27415 "configure"
+#line 27447 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27419: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27451: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:27425: \$? = $ac_status" >&5
+  echo "$as_me:27457: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27441,7 +27473,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27444: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27476: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -27463,18 +27495,18 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:27466: checking for union wait" >&5
+echo "$as_me:27498: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27473 "configure"
+#line 27505 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
-main ()
+main (void)
 {
 int x;
 	 int y = WEXITSTATUS(x);
@@ -27486,16 +27518,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27492: \$? = $ac_status" >&5
+  echo "$as_me:27524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27498: \$? = $ac_status" >&5
+  echo "$as_me:27530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -27505,11 +27537,11 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27508 "configure"
+#line 27540 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
-main ()
+main (void)
 {
 union wait x;
 #ifdef WEXITSTATUS
@@ -27525,16 +27557,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27531: \$? = $ac_status" >&5
+  echo "$as_me:27563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27537: \$? = $ac_status" >&5
+  echo "$as_me:27569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -27549,7 +27581,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:27552: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:27584: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -27558,18 +27590,18 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:27561: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:27593: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 27568 "configure"
+#line 27600 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
-main ()
+main (void)
 {
 union wait x; wait(&x)
   ;
@@ -27577,16 +27609,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27583: \$? = $ac_status" >&5
+  echo "$as_me:27615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27589: \$? = $ac_status" >&5
+  echo "$as_me:27621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -27598,25 +27630,25 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27601: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:27633: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes &&
 cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:27608: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:27640: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 27615 "configure"
+#line 27647 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
-main ()
+main (void)
 {
 union wait x; waitpid(0, &x, 0)
   ;
@@ -27624,16 +27656,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27627: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27630: \$? = $ac_status" >&5
+  echo "$as_me:27662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27636: \$? = $ac_status" >&5
+  echo "$as_me:27668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -27645,7 +27677,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27648: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:27680: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes &&
 cat >>confdefs.h <<\EOF
@@ -27654,13 +27686,13 @@ EOF
 
 fi
 
-echo "$as_me:27657: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27689: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27663 "configure"
+#line 27695 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27674,7 +27706,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27677: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27709: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -27688,7 +27720,7 @@ EOF
 
 fi
 
-echo "$as_me:27691: checking type of array argument to getgroups" >&5
+echo "$as_me:27723: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27697,7 +27729,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27700 "configure"
+#line 27732 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -27706,7 +27738,7 @@ else
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 
 int
-main ()
+main (void)
 {
   gid_t gidset[NGID];
   int i, n;
@@ -27723,15 +27755,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27729: \$? = $ac_status" >&5
+  echo "$as_me:27761: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27734: \$? = $ac_status" >&5
+  echo "$as_me:27766: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -27744,7 +27776,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 27747 "configure"
+#line 27779 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -27759,24 +27791,24 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:27762: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:27794: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:27769: checking for off_t" >&5
+echo "$as_me:27801: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27775 "configure"
+#line 27807 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((off_t *) 0)
   return 0;
@@ -27787,16 +27819,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27793: \$? = $ac_status" >&5
+  echo "$as_me:27825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27799: \$? = $ac_status" >&5
+  echo "$as_me:27831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27806,7 +27838,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27809: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27841: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -27818,17 +27850,17 @@ EOF
 
 fi
 
-echo "$as_me:27821: checking for pid_t" >&5
+echo "$as_me:27853: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27827 "configure"
+#line 27859 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((pid_t *) 0)
   return 0;
@@ -27839,16 +27871,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27845: \$? = $ac_status" >&5
+  echo "$as_me:27877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27851: \$? = $ac_status" >&5
+  echo "$as_me:27883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -27858,7 +27890,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27861: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27893: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -27870,13 +27902,13 @@ EOF
 
 fi
 
-echo "$as_me:27873: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27905: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27879 "configure"
+#line 27911 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27890,7 +27922,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27893: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27925: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -27904,17 +27936,17 @@ EOF
 
 fi
 
-echo "$as_me:27907: checking for mode_t" >&5
+echo "$as_me:27939: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27913 "configure"
+#line 27945 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((mode_t *) 0)
   return 0;
@@ -27925,16 +27957,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27931: \$? = $ac_status" >&5
+  echo "$as_me:27963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27937: \$? = $ac_status" >&5
+  echo "$as_me:27969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27944,7 +27976,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27947: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27979: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -27956,17 +27988,17 @@ EOF
 
 fi
 
-	echo "$as_me:27959: checking for ssize_t" >&5
+	echo "$as_me:27991: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27965 "configure"
+#line 27997 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((ssize_t *) 0)
   return 0;
@@ -27977,16 +28009,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27983: \$? = $ac_status" >&5
+  echo "$as_me:28015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27989: \$? = $ac_status" >&5
+  echo "$as_me:28021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -27996,7 +28028,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27999: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:28031: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   ac_cv_type_ssize_t=yes
@@ -28012,20 +28044,20 @@ EOF
 
 fi
 
-	echo "$as_me:28015: checking for socklen_t" >&5
+	echo "$as_me:28047: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28021 "configure"
+#line 28053 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 int
-main ()
+main (void)
 {
 if ((socklen_t *) 0)
   return 0;
@@ -28036,16 +28068,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28042: \$? = $ac_status" >&5
+  echo "$as_me:28074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28048: \$? = $ac_status" >&5
+  echo "$as_me:28080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -28055,7 +28087,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28058: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:28090: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
   ac_cv_type_socklen_t=yes
@@ -28071,7 +28103,7 @@ EOF
 
 fi
 
-echo "$as_me:28074: checking for long long type" >&5
+echo "$as_me:28106: checking for long long type" >&5
 echo $ECHO_N "checking for long long type... $ECHO_C" >&6
 if test "${cf_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28102,7 +28134,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:28105: result: $cf_cv_type_long_long" >&5
+echo "$as_me:28137: result: $cf_cv_type_long_long" >&5
 echo "${ECHO_T}$cf_cv_type_long_long" >&6
 
 if test "$cf_cv_type_long_long" = yes ; then
@@ -28113,14 +28145,14 @@ EOF
 
 fi
 
-echo "$as_me:28116: checking for tm.tm_gmtoff" >&5
+echo "$as_me:28148: checking for tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6
 if test "${cf_cv_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28123 "configure"
+#line 28155 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -28135,7 +28167,7 @@ else
 #endif
 
 int
-main ()
+main (void)
 {
 
 	struct tm foo;
@@ -28145,16 +28177,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28148: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28151: \$? = $ac_status" >&5
+  echo "$as_me:28183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28157: \$? = $ac_status" >&5
+  echo "$as_me:28189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -28165,24 +28197,24 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:28168: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:28200: result: $cf_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
 test $cf_cv_tm_gmtoff = no &&
 cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:28175: checking for int" >&5
+echo "$as_me:28207: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28181 "configure"
+#line 28213 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((int *) 0)
   return 0;
@@ -28193,16 +28225,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28199: \$? = $ac_status" >&5
+  echo "$as_me:28231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28205: \$? = $ac_status" >&5
+  echo "$as_me:28237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -28212,10 +28244,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28215: result: $ac_cv_type_int" >&5
+echo "$as_me:28247: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:28218: checking size of int" >&5
+echo "$as_me:28250: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28224,11 +28256,11 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28227 "configure"
+#line 28259 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
   ;
@@ -28236,25 +28268,25 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28242: \$? = $ac_status" >&5
+  echo "$as_me:28274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28248: \$? = $ac_status" >&5
+  echo "$as_me:28280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28253 "configure"
+#line 28285 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
   ;
@@ -28262,16 +28294,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28268: \$? = $ac_status" >&5
+  echo "$as_me:28300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28274: \$? = $ac_status" >&5
+  echo "$as_me:28306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28287,11 +28319,11 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28290 "configure"
+#line 28322 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
   ;
@@ -28299,16 +28331,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28334: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28305: \$? = $ac_status" >&5
+  echo "$as_me:28337: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28311: \$? = $ac_status" >&5
+  echo "$as_me:28343: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28324,11 +28356,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28327 "configure"
+#line 28359 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
   ;
@@ -28336,16 +28368,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28342: \$? = $ac_status" >&5
+  echo "$as_me:28374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28348: \$? = $ac_status" >&5
+  echo "$as_me:28380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28358,16 +28390,16 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28361: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28393: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28366 "configure"
+#line 28398 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
@@ -28379,15 +28411,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28385: \$? = $ac_status" >&5
+  echo "$as_me:28417: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28390: \$? = $ac_status" >&5
+  echo "$as_me:28422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -28403,7 +28435,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:28406: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:28438: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
@@ -28411,27 +28443,27 @@ EOF
 
 if test "${ac_cv_type_int+set}" = set; then
 	if test "${ac_cv_sizeof_int+set}" != set; then
-		{ echo "$as_me:28414: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:28446: WARNING: using 4 for sizeof int" >&5
 echo "$as_me: WARNING: using 4 for sizeof int" >&2;}
 		ac_cv_sizeof_int=4
 	elif test "x${ac_cv_sizeof_int}" = x0; then
-		{ echo "$as_me:28418: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:28450: WARNING: sizeof int not found, using 4" >&5
 echo "$as_me: WARNING: sizeof int not found, using 4" >&2;}
 		ac_cv_sizeof_int=4
 	fi
 fi
 
-echo "$as_me:28424: checking for long" >&5
+echo "$as_me:28456: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28430 "configure"
+#line 28462 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((long *) 0)
   return 0;
@@ -28442,16 +28474,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28448: \$? = $ac_status" >&5
+  echo "$as_me:28480: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28454: \$? = $ac_status" >&5
+  echo "$as_me:28486: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -28461,10 +28493,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28464: result: $ac_cv_type_long" >&5
+echo "$as_me:28496: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:28467: checking size of long" >&5
+echo "$as_me:28499: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28473,11 +28505,11 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28476 "configure"
+#line 28508 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
   ;
@@ -28485,25 +28517,25 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28491: \$? = $ac_status" >&5
+  echo "$as_me:28523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28497: \$? = $ac_status" >&5
+  echo "$as_me:28529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28502 "configure"
+#line 28534 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
   ;
@@ -28511,16 +28543,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28546: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28517: \$? = $ac_status" >&5
+  echo "$as_me:28549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28523: \$? = $ac_status" >&5
+  echo "$as_me:28555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28536,11 +28568,11 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28539 "configure"
+#line 28571 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
   ;
@@ -28548,16 +28580,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28554: \$? = $ac_status" >&5
+  echo "$as_me:28586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28560: \$? = $ac_status" >&5
+  echo "$as_me:28592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28573,11 +28605,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28576 "configure"
+#line 28608 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
   ;
@@ -28585,16 +28617,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28591: \$? = $ac_status" >&5
+  echo "$as_me:28623: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28597: \$? = $ac_status" >&5
+  echo "$as_me:28629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28607,16 +28639,16 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28610: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28642: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28615 "configure"
+#line 28647 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
@@ -28628,15 +28660,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28663: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28634: \$? = $ac_status" >&5
+  echo "$as_me:28666: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28639: \$? = $ac_status" >&5
+  echo "$as_me:28671: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -28652,7 +28684,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:28655: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:28687: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
@@ -28660,27 +28692,27 @@ EOF
 
 if test "${ac_cv_type_long+set}" = set; then
 	if test "${ac_cv_sizeof_long+set}" != set; then
-		{ echo "$as_me:28663: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:28695: WARNING: using 4 for sizeof long" >&5
 echo "$as_me: WARNING: using 4 for sizeof long" >&2;}
 		ac_cv_sizeof_long=4
 	elif test "x${ac_cv_sizeof_long}" = x0; then
-		{ echo "$as_me:28667: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:28699: WARNING: sizeof long not found, using 4" >&5
 echo "$as_me: WARNING: sizeof long not found, using 4" >&2;}
 		ac_cv_sizeof_long=4
 	fi
 fi
 
-echo "$as_me:28673: checking for off_t" >&5
+echo "$as_me:28705: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28679 "configure"
+#line 28711 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((off_t *) 0)
   return 0;
@@ -28691,16 +28723,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28726: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28697: \$? = $ac_status" >&5
+  echo "$as_me:28729: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28703: \$? = $ac_status" >&5
+  echo "$as_me:28735: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -28710,10 +28742,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28713: result: $ac_cv_type_off_t" >&5
+echo "$as_me:28745: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:28716: checking size of off_t" >&5
+echo "$as_me:28748: checking size of off_t" >&5
 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28722,11 +28754,11 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28725 "configure"
+#line 28757 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
   ;
@@ -28734,25 +28766,25 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28737: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28740: \$? = $ac_status" >&5
+  echo "$as_me:28772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28746: \$? = $ac_status" >&5
+  echo "$as_me:28778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28751 "configure"
+#line 28783 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
   ;
@@ -28760,16 +28792,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28766: \$? = $ac_status" >&5
+  echo "$as_me:28798: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28772: \$? = $ac_status" >&5
+  echo "$as_me:28804: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28785,11 +28817,11 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28788 "configure"
+#line 28820 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
   ;
@@ -28797,16 +28829,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28800: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28832: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28803: \$? = $ac_status" >&5
+  echo "$as_me:28835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28809: \$? = $ac_status" >&5
+  echo "$as_me:28841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28822,11 +28854,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28825 "configure"
+#line 28857 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
   ;
@@ -28834,16 +28866,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28840: \$? = $ac_status" >&5
+  echo "$as_me:28872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28846: \$? = $ac_status" >&5
+  echo "$as_me:28878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28856,16 +28888,16 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28859: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28891: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28864 "configure"
+#line 28896 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
@@ -28877,15 +28909,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28883: \$? = $ac_status" >&5
+  echo "$as_me:28915: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28888: \$? = $ac_status" >&5
+  echo "$as_me:28920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28901,7 +28933,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28904: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28936: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
@@ -28909,27 +28941,27 @@ EOF
 
 if test "${ac_cv_type_off_t+set}" = set; then
 	if test "${ac_cv_sizeof_off_t+set}" != set; then
-		{ echo "$as_me:28912: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28944: WARNING: using 4 for sizeof off_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;}
 		ac_cv_sizeof_off_t=4
 	elif test "x${ac_cv_sizeof_off_t}" = x0; then
-		{ echo "$as_me:28916: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28948: WARNING: sizeof off_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;}
 		ac_cv_sizeof_off_t=4
 	fi
 fi
 
-echo "$as_me:28922: checking for time_t" >&5
+echo "$as_me:28954: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28928 "configure"
+#line 28960 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((time_t *) 0)
   return 0;
@@ -28940,16 +28972,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28946: \$? = $ac_status" >&5
+  echo "$as_me:28978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28952: \$? = $ac_status" >&5
+  echo "$as_me:28984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28959,10 +28991,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28962: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28994: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28965: checking size of time_t" >&5
+echo "$as_me:28997: checking size of time_t" >&5
 echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28971,11 +29003,11 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28974 "configure"
+#line 29006 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
   ;
@@ -28983,25 +29015,25 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28989: \$? = $ac_status" >&5
+  echo "$as_me:29021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28995: \$? = $ac_status" >&5
+  echo "$as_me:29027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29000 "configure"
+#line 29032 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
   ;
@@ -29009,16 +29041,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29015: \$? = $ac_status" >&5
+  echo "$as_me:29047: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29021: \$? = $ac_status" >&5
+  echo "$as_me:29053: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -29034,11 +29066,11 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29037 "configure"
+#line 29069 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
   ;
@@ -29046,16 +29078,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29052: \$? = $ac_status" >&5
+  echo "$as_me:29084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29058: \$? = $ac_status" >&5
+  echo "$as_me:29090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -29071,11 +29103,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 29074 "configure"
+#line 29106 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
   ;
@@ -29083,16 +29115,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29089: \$? = $ac_status" >&5
+  echo "$as_me:29121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29095: \$? = $ac_status" >&5
+  echo "$as_me:29127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -29105,16 +29137,16 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:29108: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:29140: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29113 "configure"
+#line 29145 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
@@ -29126,15 +29158,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29132: \$? = $ac_status" >&5
+  echo "$as_me:29164: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29137: \$? = $ac_status" >&5
+  echo "$as_me:29169: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -29150,7 +29182,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:29153: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:29185: result: $ac_cv_sizeof_time_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
@@ -29158,27 +29190,27 @@ EOF
 
 if test "${ac_cv_type_time_t+set}" = set; then
 	if test "${ac_cv_sizeof_time_t+set}" != set; then
-		{ echo "$as_me:29161: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:29193: WARNING: using 4 for sizeof time_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;}
 		ac_cv_sizeof_time_t=4
 	elif test "x${ac_cv_sizeof_time_t}" = x0; then
-		{ echo "$as_me:29165: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:29197: WARNING: sizeof time_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;}
 		ac_cv_sizeof_time_t=4
 	fi
 fi
 
-echo "$as_me:29171: checking for intptr_t" >&5
+echo "$as_me:29203: checking for intptr_t" >&5
 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29177 "configure"
+#line 29209 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
-main ()
+main (void)
 {
 if ((intptr_t *) 0)
   return 0;
@@ -29189,16 +29221,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29195: \$? = $ac_status" >&5
+  echo "$as_me:29227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29201: \$? = $ac_status" >&5
+  echo "$as_me:29233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -29208,7 +29240,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:29211: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:29243: result: $ac_cv_type_intptr_t" >&5
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test $ac_cv_type_intptr_t = yes; then
   :
@@ -29222,17 +29254,17 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:29225: checking for working alloca.h" >&5
+echo "$as_me:29257: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29231 "configure"
+#line 29263 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (2 * sizeof (int));
   ;
@@ -29240,16 +29272,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29246: \$? = $ac_status" >&5
+  echo "$as_me:29278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29252: \$? = $ac_status" >&5
+  echo "$as_me:29284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -29259,7 +29291,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29262: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:29294: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -29269,13 +29301,13 @@ EOF
 
 fi
 
-echo "$as_me:29272: checking for alloca" >&5
+echo "$as_me:29304: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29278 "configure"
+#line 29310 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -29299,7 +29331,7 @@ char *alloca ();
 #endif
 
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (1);
   ;
@@ -29307,16 +29339,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29310: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29313: \$? = $ac_status" >&5
+  echo "$as_me:29345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29319: \$? = $ac_status" >&5
+  echo "$as_me:29351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -29326,7 +29358,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29329: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:29361: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -29347,13 +29379,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:29350: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:29382: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29356 "configure"
+#line 29388 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -29371,18 +29403,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:29374: result: $ac_cv_os_cray" >&5
+echo "$as_me:29406: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29379: checking for $ac_func" >&5
+echo "$as_me:29411: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29385 "configure"
+#line 29417 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29397,7 +29429,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -29413,16 +29445,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29419: \$? = $ac_status" >&5
+  echo "$as_me:29451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29425: \$? = $ac_status" >&5
+  echo "$as_me:29457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29432,7 +29464,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29435: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29467: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -29446,7 +29478,7 @@ fi
   done
 fi
 
-echo "$as_me:29449: checking stack direction for C alloca" >&5
+echo "$as_me:29481: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29455,10 +29487,10 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29458 "configure"
+#line 29490 "configure"
 #include "confdefs.h"
 int
-find_stack_direction ()
+find_stack_direction (void)
 {
   static char *addr = 0;
   auto char dummy;
@@ -29472,21 +29504,21 @@ find_stack_direction ()
 }
 
 int
-main ()
+main (void)
 {
   $ac_main_return (find_stack_direction () < 0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29484: \$? = $ac_status" >&5
+  echo "$as_me:29516: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29489: \$? = $ac_status" >&5
+  echo "$as_me:29521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -29498,7 +29530,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29501: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:29533: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -29510,23 +29542,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:29513: checking for $ac_header" >&5
+echo "$as_me:29545: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29519 "configure"
+#line 29551 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:29523: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29555: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:29529: \$? = $ac_status" >&5
+  echo "$as_me:29561: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -29545,7 +29577,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:29548: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29580: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -29558,13 +29590,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29561: checking for $ac_func" >&5
+echo "$as_me:29593: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29567 "configure"
+#line 29599 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29579,7 +29611,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -29595,16 +29627,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29601: \$? = $ac_status" >&5
+  echo "$as_me:29633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29607: \$? = $ac_status" >&5
+  echo "$as_me:29639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29614,7 +29646,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29617: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29649: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -29626,7 +29658,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:29629: checking for working fork" >&5
+  echo "$as_me:29661: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29641,7 +29673,7 @@ else
       # include <unistd.h>
       #endif
       /* Some systems only have a dummy stub for fork() */
-      int main ()
+      int main (void)
       {
         if (fork() < 0)
           $ac_main_return (1);
@@ -29649,15 +29681,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29655: \$? = $ac_status" >&5
+  echo "$as_me:29687: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29660: \$? = $ac_status" >&5
+  echo "$as_me:29692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -29669,7 +29701,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29672: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:29704: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -29683,12 +29715,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:29686: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29718: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:29691: checking for working vfork" >&5
+  echo "$as_me:29723: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29697,7 +29729,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29700 "configure"
+#line 29732 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -29738,7 +29770,7 @@ sparc_address_test (arg) int arg;
 }
 
 int
-main ()
+main (void)
 {
   pid_t parent = getpid ();
   pid_t child;
@@ -29794,15 +29826,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29829: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29800: \$? = $ac_status" >&5
+  echo "$as_me:29832: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29805: \$? = $ac_status" >&5
+  echo "$as_me:29837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -29814,13 +29846,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29817: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29849: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:29823: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29855: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -29845,21 +29877,21 @@ EOF
 
 fi
 
-echo "$as_me:29848: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29880: checking if we should use fcntl or ioctl" >&5
 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
 if test "${cf_cv_fionbio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29855 "configure"
+#line 29887 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
 int
-main ()
+main (void)
 {
 
         int ret = ioctl(0, FIONBIO, (char *)0);
@@ -29869,16 +29901,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29875: \$? = $ac_status" >&5
+  echo "$as_me:29907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29881: \$? = $ac_status" >&5
+  echo "$as_me:29913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29886,7 +29918,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29889 "configure"
+#line 29921 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29898,7 +29930,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 #endif
 int
-main ()
+main (void)
 {
 
         int ret = fcntl(0, F_SETFL, O_NONBLOCK);
@@ -29908,16 +29940,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29943: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29914: \$? = $ac_status" >&5
+  echo "$as_me:29946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29920: \$? = $ac_status" >&5
+  echo "$as_me:29952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29930,25 +29962,25 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29933: result: $cf_cv_fionbio" >&5
+echo "$as_me:29965: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
 test "$cf_cv_fionbio" = "fcntl" &&
 cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:29940: checking for broken/missing definition of remove" >&5
+echo "$as_me:29972: checking for broken/missing definition of remove" >&5
 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
 if test "${cf_cv_baddef_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29947 "configure"
+#line 29979 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 remove("dummy")
   ;
@@ -29956,28 +29988,28 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29962: \$? = $ac_status" >&5
+  echo "$as_me:29994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29968: \$? = $ac_status" >&5
+  echo "$as_me:30000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 29975 "configure"
+#line 30007 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
 int
-main ()
+main (void)
 {
 remove("dummy")
   ;
@@ -29985,16 +30017,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29991: \$? = $ac_status" >&5
+  echo "$as_me:30023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29997: \$? = $ac_status" >&5
+  echo "$as_me:30029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -30009,27 +30041,27 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30012: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:30044: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
 test "$cf_cv_baddef_remove" != no &&
 cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:30019: checking for lstat" >&5
+echo "$as_me:30051: checking for lstat" >&5
 echo $ECHO_N "checking for lstat... $ECHO_C" >&6
 if test "${ac_cv_func_lstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30026 "configure"
+#line 30058 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 int
-main ()
+main (void)
 {
 lstat(".", (struct stat *)0)
   ;
@@ -30037,16 +30069,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30043: \$? = $ac_status" >&5
+  echo "$as_me:30075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30049: \$? = $ac_status" >&5
+  echo "$as_me:30081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -30058,7 +30090,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30061: result: $ac_cv_func_lstat " >&5
+echo "$as_me:30093: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -30093,13 +30125,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30096: checking for $ac_func" >&5
+echo "$as_me:30128: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30102 "configure"
+#line 30134 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -30114,7 +30146,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -30130,16 +30162,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30136: \$? = $ac_status" >&5
+  echo "$as_me:30168: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30142: \$? = $ac_status" >&5
+  echo "$as_me:30174: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30149,7 +30181,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30152: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:30184: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -30165,13 +30197,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30168: checking for $ac_func" >&5
+echo "$as_me:30200: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30174 "configure"
+#line 30206 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -30186,7 +30218,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -30202,16 +30234,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30208: \$? = $ac_status" >&5
+  echo "$as_me:30240: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30214: \$? = $ac_status" >&5
+  echo "$as_me:30246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30221,7 +30253,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30224: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:30256: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -30233,7 +30265,7 @@ else
 fi
 done
 
-echo "$as_me:30236: checking for random-integer functions" >&5
+echo "$as_me:30268: checking for random-integer functions" >&5
 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
 if test "${cf_cv_srand_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30253,7 +30285,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30256 "configure"
+#line 30288 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30264,7 +30296,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
   ;
@@ -30272,16 +30304,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30278: \$? = $ac_status" >&5
+  echo "$as_me:30310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30284: \$? = $ac_status" >&5
+  echo "$as_me:30316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -30293,10 +30325,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30296: result: $cf_cv_srand_func" >&5
+echo "$as_me:30328: result: $cf_cv_srand_func" >&5
 echo "${ECHO_T}$cf_cv_srand_func" >&6
 if test "$cf_cv_srand_func" != unknown ; then
-	echo "$as_me:30299: checking for range of random-integers" >&5
+	echo "$as_me:30331: checking for range of random-integers" >&5
 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
 if test "${cf_cv_rand_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30317,7 +30349,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 30320 "configure"
+#line 30352 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30328,7 +30360,7 @@ else
 #endif
 
 int
-main ()
+main (void)
 {
 long x = $cf_cv_rand_max
   ;
@@ -30336,16 +30368,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30342: \$? = $ac_status" >&5
+  echo "$as_me:30374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30348: \$? = $ac_status" >&5
+  echo "$as_me:30380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30356,19 +30388,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30359: result: $cf_cv_rand_max" >&5
+echo "$as_me:30391: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	(*/arc4random)
-		echo "$as_me:30364: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:30396: checking if <bsd/stdlib.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/stdlib.h> should be included... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 30367 "configure"
+#line 30399 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
-main ()
+main (void)
 {
 void *arc4random(int);
 						void *x = arc4random(1)
@@ -30377,27 +30409,27 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30383: \$? = $ac_status" >&5
+  echo "$as_me:30415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30389: \$? = $ac_status" >&5
+  echo "$as_me:30421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 30396 "configure"
+#line 30428 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
-main ()
+main (void)
 {
 unsigned x = arc4random()
   ;
@@ -30405,16 +30437,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30411: \$? = $ac_status" >&5
+  echo "$as_me:30443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30417: \$? = $ac_status" >&5
+  echo "$as_me:30449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -30425,7 +30457,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:30428: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:30460: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -30435,14 +30467,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:30438: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:30470: checking if <bsd/random.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/random.h> should be included... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 30441 "configure"
+#line 30473 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
-main ()
+main (void)
 {
 void *arc4random(int);
 							void *x = arc4random(1)
@@ -30451,27 +30483,27 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30454: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30457: \$? = $ac_status" >&5
+  echo "$as_me:30489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30463: \$? = $ac_status" >&5
+  echo "$as_me:30495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 30470 "configure"
+#line 30502 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
-main ()
+main (void)
 {
 unsigned x = arc4random()
   ;
@@ -30479,16 +30511,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30485: \$? = $ac_status" >&5
+  echo "$as_me:30517: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30491: \$? = $ac_status" >&5
+  echo "$as_me:30523: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -30499,7 +30531,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:30502: result: $cf_bsd_random_h" >&5
+			echo "$as_me:30534: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -30509,7 +30541,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:30512: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:30544: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -30544,13 +30576,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:30547: checking for $ac_func declaration" >&5
+echo "$as_me:30579: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30553 "configure"
+#line 30585 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30561,7 +30593,7 @@ else
 #endif
 
 int
-main ()
+main (void)
 {
 #ifndef $ac_func
 extern	int	$ac_func();
@@ -30571,20 +30603,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30577: \$? = $ac_status" >&5
+  echo "$as_me:30609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30583: \$? = $ac_status" >&5
+  echo "$as_me:30615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30587 "configure"
+#line 30619 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30595,7 +30627,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 #ifndef $ac_func
 int	(*p)() = $ac_func;
@@ -30605,16 +30637,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30611: \$? = $ac_status" >&5
+  echo "$as_me:30643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30617: \$? = $ac_status" >&5
+  echo "$as_me:30649: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30635,11 +30667,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:30638: result: yes" >&5
+  echo "$as_me:30670: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30642: result: no" >&5
+  echo "$as_me:30674: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30654,17 +30686,17 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:30657: checking for $ac_func declaration" >&5
+echo "$as_me:30689: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30663 "configure"
+#line 30695 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
-main ()
+main (void)
 {
 #ifndef $ac_func
 extern	int	$ac_func();
@@ -30674,24 +30706,24 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30680: \$? = $ac_status" >&5
+  echo "$as_me:30712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30686: \$? = $ac_status" >&5
+  echo "$as_me:30718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30690 "configure"
+#line 30722 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
-main ()
+main (void)
 {
 #ifndef $ac_func
 int	(*p)() = $ac_func;
@@ -30701,16 +30733,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30736: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30707: \$? = $ac_status" >&5
+  echo "$as_me:30739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30713: \$? = $ac_status" >&5
+  echo "$as_me:30745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30731,11 +30763,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:30734: result: yes" >&5
+  echo "$as_me:30766: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30738: result: no" >&5
+  echo "$as_me:30770: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30750,19 +30782,19 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:30753: checking for $ac_func declaration" >&5
+echo "$as_me:30785: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30759 "configure"
+#line 30791 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <grp.h>
 int
-main ()
+main (void)
 {
 #ifndef $ac_func
 extern	int	$ac_func();
@@ -30772,26 +30804,26 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30778: \$? = $ac_status" >&5
+  echo "$as_me:30810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30784: \$? = $ac_status" >&5
+  echo "$as_me:30816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30788 "configure"
+#line 30820 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <grp.h>
 int
-main ()
+main (void)
 {
 #ifndef $ac_func
 int	(*p)() = $ac_func;
@@ -30801,16 +30833,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30807: \$? = $ac_status" >&5
+  echo "$as_me:30839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30813: \$? = $ac_status" >&5
+  echo "$as_me:30845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30831,11 +30863,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:30834: result: yes" >&5
+  echo "$as_me:30866: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30838: result: no" >&5
+  echo "$as_me:30870: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30847,20 +30879,20 @@ EOF
 fi
 done
 
-echo "$as_me:30850: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30882: checking if TRUE/FALSE are defined" >&5
 echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6
 if test "${cf_cv_bool_defs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30857 "configure"
+#line 30889 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 int x = TRUE, y = FALSE
   ;
@@ -30868,16 +30900,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30874: \$? = $ac_status" >&5
+  echo "$as_me:30906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30880: \$? = $ac_status" >&5
+  echo "$as_me:30912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30888,7 +30920,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30891: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30923: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30902,14 +30934,14 @@ EOF
 
 fi
 
-echo "$as_me:30905: checking if external errno is declared" >&5
+echo "$as_me:30937: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30912 "configure"
+#line 30944 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30919,7 +30951,7 @@ else
 #include <sys/types.h>
 #include <errno.h>
 int
-main ()
+main (void)
 {
 int x = (int) errno
   ;
@@ -30927,16 +30959,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30933: \$? = $ac_status" >&5
+  echo "$as_me:30965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30939: \$? = $ac_status" >&5
+  echo "$as_me:30971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30947,7 +30979,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30950: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30982: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -30962,21 +30994,21 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30965: checking if external errno exists" >&5
+echo "$as_me:30997: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30972 "configure"
+#line 31004 "configure"
 #include "confdefs.h"
 
 #undef errno
 extern int errno;
 
 int
-main ()
+main (void)
 {
 errno = 2
   ;
@@ -30984,16 +31016,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30990: \$? = $ac_status" >&5
+  echo "$as_me:31022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30996: \$? = $ac_status" >&5
+  echo "$as_me:31028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -31004,7 +31036,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31007: result: $cf_cv_have_errno" >&5
+echo "$as_me:31039: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -31017,7 +31049,7 @@ EOF
 
 fi
 
-echo "$as_me:31020: checking if we can set errno" >&5
+echo "$as_me:31052: checking if we can set errno" >&5
 echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6
 if test "${cf_cv_set_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31025,11 +31057,11 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 31028 "configure"
+#line 31060 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
-main ()
+main (void)
 {
 errno = 255
   ;
@@ -31037,16 +31069,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31043: \$? = $ac_status" >&5
+  echo "$as_me:31075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31049: \$? = $ac_status" >&5
+  echo "$as_me:31081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -31057,26 +31089,26 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 31060 "configure"
+#line 31092 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
-int main()
+int main(void)
 {
 	errno = 255;
 	${cf_cv_main_return:-return}(errno != 255);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:31071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31074: \$? = $ac_status" >&5
+  echo "$as_me:31106: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:31076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31079: \$? = $ac_status" >&5
+  echo "$as_me:31111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -31089,25 +31121,25 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:31092: result: $cf_cv_set_errno" >&5
+echo "$as_me:31124: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
 test "$cf_cv_set_errno" != no &&
 cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:31099: checking for setlocale()" >&5
+echo "$as_me:31131: checking for setlocale()" >&5
 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6
 if test "${cf_cv_locale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31106 "configure"
+#line 31138 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
-main ()
+main (void)
 {
 setlocale(LC_ALL, "")
   ;
@@ -31115,16 +31147,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31121: \$? = $ac_status" >&5
+  echo "$as_me:31153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31127: \$? = $ac_status" >&5
+  echo "$as_me:31159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -31136,7 +31168,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31139: result: $cf_cv_locale" >&5
+echo "$as_me:31171: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -31144,14 +31176,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:31147: checking if NGROUPS is defined" >&5
+echo "$as_me:31179: checking if NGROUPS is defined" >&5
 echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6
 if test "${cf_cv_ngroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31154 "configure"
+#line 31186 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -31162,7 +31194,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 int x = NGROUPS
   ;
@@ -31170,23 +31202,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31176: \$? = $ac_status" >&5
+  echo "$as_me:31208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31182: \$? = $ac_status" >&5
+  echo "$as_me:31214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 31189 "configure"
+#line 31221 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -31197,7 +31229,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 
 int
-main ()
+main (void)
 {
 int x = NGROUPS_MAX
   ;
@@ -31205,16 +31237,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31211: \$? = $ac_status" >&5
+  echo "$as_me:31243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31217: \$? = $ac_status" >&5
+  echo "$as_me:31249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -31226,7 +31258,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:31229: result: $cf_cv_ngroups" >&5
+echo "$as_me:31261: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -31244,14 +31276,14 @@ EOF
 
 fi
 
-echo "$as_me:31247: checking if external sys_nerr is declared" >&5
+echo "$as_me:31279: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31254 "configure"
+#line 31286 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31261,7 +31293,7 @@ else
 #include <sys/types.h>
 #include <errno.h>
 int
-main ()
+main (void)
 {
 int x = (int) sys_nerr
   ;
@@ -31269,16 +31301,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31275: \$? = $ac_status" >&5
+  echo "$as_me:31307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31281: \$? = $ac_status" >&5
+  echo "$as_me:31313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -31289,7 +31321,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31292: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:31324: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -31304,21 +31336,21 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:31307: checking if external sys_nerr exists" >&5
+echo "$as_me:31339: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31314 "configure"
+#line 31346 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
 extern int sys_nerr;
 
 int
-main ()
+main (void)
 {
 sys_nerr = 2
   ;
@@ -31326,16 +31358,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31332: \$? = $ac_status" >&5
+  echo "$as_me:31364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31338: \$? = $ac_status" >&5
+  echo "$as_me:31370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -31346,7 +31378,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31349: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:31381: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -31359,14 +31391,14 @@ EOF
 
 fi
 
-echo "$as_me:31362: checking if external sys_errlist is declared" >&5
+echo "$as_me:31394: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31369 "configure"
+#line 31401 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31376,7 +31408,7 @@ else
 #include <sys/types.h>
 #include <errno.h>
 int
-main ()
+main (void)
 {
 int x = (int) sys_errlist
   ;
@@ -31384,16 +31416,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31419: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31390: \$? = $ac_status" >&5
+  echo "$as_me:31422: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31396: \$? = $ac_status" >&5
+  echo "$as_me:31428: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -31404,7 +31436,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31407: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:31439: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -31419,21 +31451,21 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:31422: checking if external sys_errlist exists" >&5
+echo "$as_me:31454: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31429 "configure"
+#line 31461 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
 extern int sys_errlist;
 
 int
-main ()
+main (void)
 {
 sys_errlist = 2
   ;
@@ -31441,16 +31473,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31447: \$? = $ac_status" >&5
+  echo "$as_me:31479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31453: \$? = $ac_status" >&5
+  echo "$as_me:31485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -31461,7 +31493,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31464: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:31496: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -31477,23 +31509,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31480: checking for $ac_header" >&5
+echo "$as_me:31512: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 31486 "configure"
+#line 31518 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31490: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:31522: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:31496: \$? = $ac_status" >&5
+  echo "$as_me:31528: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31512,7 +31544,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:31515: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:31547: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -31522,14 +31554,14 @@ EOF
 fi
 done
 
-echo "$as_me:31525: checking for lastlog path" >&5
+echo "$as_me:31557: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31532 "configure"
+#line 31564 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31541,7 +31573,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 #endif
 int
-main ()
+main (void)
 {
 char *path = _PATH_LASTLOG
   ;
@@ -31549,16 +31581,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31584: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31555: \$? = $ac_status" >&5
+  echo "$as_me:31587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31561: \$? = $ac_status" >&5
+  echo "$as_me:31593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -31573,14 +31605,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31576: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:31608: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no &&
 cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:31583: checking for utmp implementation" >&5
+echo "$as_me:31615: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31597,11 +31629,11 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31600 "configure"
+#line 31632 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
-main ()
+main (void)
 {
 struct $cf_header x;
 	 char *name = x.ut_name; /* utmp.h and compatible definitions */
@@ -31611,16 +31643,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31617: \$? = $ac_status" >&5
+  echo "$as_me:31649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31623: \$? = $ac_status" >&5
+  echo "$as_me:31655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31629,11 +31661,11 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31632 "configure"
+#line 31664 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
-main ()
+main (void)
 {
 struct $cf_header x;
 	 char *name = x.ut_user; /* utmpx.h must declare this */
@@ -31643,16 +31675,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31649: \$? = $ac_status" >&5
+  echo "$as_me:31681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31655: \$? = $ac_status" >&5
+  echo "$as_me:31687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31667,7 +31699,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31670: result: $cf_cv_have_utmp" >&5
+echo "$as_me:31702: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -31682,20 +31714,20 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31685: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:31717: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31692 "configure"
+#line 31724 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>
 int
-main ()
+main (void)
 {
 struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
   ;
@@ -31703,16 +31735,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31738: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31709: \$? = $ac_status" >&5
+  echo "$as_me:31741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31715: \$? = $ac_status" >&5
+  echo "$as_me:31747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -31724,7 +31756,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31727: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:31759: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no &&
 cat >>confdefs.h <<\EOF
@@ -31734,20 +31766,20 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31737: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:31769: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31744 "configure"
+#line 31776 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>
 int
-main ()
+main (void)
 {
 struct $cf_cv_have_utmp x; int y = x.ut_syslen
   ;
@@ -31755,16 +31787,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31761: \$? = $ac_status" >&5
+  echo "$as_me:31793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31767: \$? = $ac_status" >&5
+  echo "$as_me:31799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -31776,7 +31808,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31779: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:31811: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no &&
 cat >>confdefs.h <<\EOF
@@ -31786,7 +31818,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31789: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:31821: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31803,11 +31835,11 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31806 "configure"
+#line 31838 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
-main ()
+main (void)
 {
 struct $cf_cv_have_utmp x;
 	 char *name = x.$cf_header;
@@ -31817,16 +31849,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31823: \$? = $ac_status" >&5
+  echo "$as_me:31855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31829: \$? = $ac_status" >&5
+  echo "$as_me:31861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -31838,12 +31870,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31841: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31873: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in
 (no)
-	{ { echo "$as_me:31846: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31878: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -31858,7 +31890,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31861: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31893: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31871,13 +31903,13 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 31874 "configure"
+#line 31906 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>
 int
-main ()
+main (void)
 {
 struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
   ;
@@ -31885,16 +31917,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31891: \$? = $ac_status" >&5
+  echo "$as_me:31923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31897: \$? = $ac_status" >&5
+  echo "$as_me:31929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31907,7 +31939,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31910: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31942: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 
@@ -31923,20 +31955,20 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31926: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31958: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31933 "configure"
+#line 31965 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>
 int
-main ()
+main (void)
 {
 struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
   ;
@@ -31944,29 +31976,29 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31950: \$? = $ac_status" >&5
+  echo "$as_me:31982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31956: \$? = $ac_status" >&5
+  echo "$as_me:31988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 31963 "configure"
+#line 31995 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>
 int
-main ()
+main (void)
 {
 struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
   ;
@@ -31974,16 +32006,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31980: \$? = $ac_status" >&5
+  echo "$as_me:32012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31986: \$? = $ac_status" >&5
+  echo "$as_me:32018: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -31997,7 +32029,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32000: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:32032: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 
@@ -32016,20 +32048,20 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32019: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:32051: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32026 "configure"
+#line 32058 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>
 int
-main ()
+main (void)
 {
 struct $cf_cv_have_utmp x; long y = x.ut_session
   ;
@@ -32037,16 +32069,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32043: \$? = $ac_status" >&5
+  echo "$as_me:32075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32049: \$? = $ac_status" >&5
+  echo "$as_me:32081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -32057,7 +32089,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32060: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:32092: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 
@@ -32068,7 +32100,7 @@ EOF
 fi
 fi
 
-echo "$as_me:32071: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:32103: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32076,13 +32108,13 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32079 "configure"
+#line 32111 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>
 int
-main ()
+main (void)
 {
 
 struct $cf_cv_have_utmp x;
@@ -32095,16 +32127,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32130: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32101: \$? = $ac_status" >&5
+  echo "$as_me:32133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32107: \$? = $ac_status" >&5
+  echo "$as_me:32139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -32115,7 +32147,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32118: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:32150: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -32124,21 +32156,21 @@ EOF
 
 fi
 
-echo "$as_me:32127: checking if external h_errno exists" >&5
+echo "$as_me:32159: checking if external h_errno exists" >&5
 echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32134 "configure"
+#line 32166 "configure"
 #include "confdefs.h"
 
 #undef h_errno
 extern int h_errno;
 
 int
-main ()
+main (void)
 {
 h_errno = 2
   ;
@@ -32146,16 +32178,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32152: \$? = $ac_status" >&5
+  echo "$as_me:32184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32158: \$? = $ac_status" >&5
+  echo "$as_me:32190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -32166,7 +32198,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32169: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:32201: result: $cf_cv_have_h_errno" >&5
 echo "${ECHO_T}$cf_cv_have_h_errno" >&6
 
 if test "$cf_cv_have_h_errno" = yes ; then
@@ -32179,7 +32211,7 @@ EOF
 
 fi
 
-echo "$as_me:32182: checking if bibp: URLs should be supported" >&5
+echo "$as_me:32214: checking if bibp: URLs should be supported" >&5
 echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
@@ -32196,14 +32228,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:32199: result: $use_bibp_urls" >&5
+echo "$as_me:32231: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
 test $use_bibp_urls = no &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:32206: checking if configuration info should be browsable" >&5
+echo "$as_me:32238: checking if configuration info should be browsable" >&5
 echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6
 
 # Check whether --enable-config-info or --disable-config-info was given.
@@ -32220,14 +32252,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:32223: result: $use_config_info" >&5
+echo "$as_me:32255: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
 test $use_config_info = no &&
 cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:32230: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:32262: checking if new-style forms-based options screen should be used" >&5
 echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
@@ -32244,14 +32276,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:32247: result: $use_forms_options" >&5
+echo "$as_me:32279: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
 test $use_forms_options = no &&
 cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:32254: checking if old-style options menu should be used" >&5
+echo "$as_me:32286: checking if old-style options menu should be used" >&5
 echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
@@ -32268,14 +32300,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:32271: result: $use_menu_options" >&5
+echo "$as_me:32303: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
 test $use_menu_options = no &&
 cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:32278: checking if sessions code should be used" >&5
+echo "$as_me:32310: checking if sessions code should be used" >&5
 echo $ECHO_N "checking if sessions code should be used... $ECHO_C" >&6
 
 # Check whether --enable-sessions or --disable-sessions was given.
@@ -32292,7 +32324,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:32295: result: $use_sessions" >&5
+echo "$as_me:32327: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -32303,7 +32335,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:32306: checking if session-caching code should be used" >&5
+echo "$as_me:32338: checking if session-caching code should be used" >&5
 echo $ECHO_N "checking if session-caching code should be used... $ECHO_C" >&6
 
 # Check whether --enable-session-cache or --disable-session-cache was given.
@@ -32320,7 +32352,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:32323: result: $use_session_cache" >&5
+echo "$as_me:32355: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -32330,7 +32362,7 @@ EOF
 
 fi
 
-echo "$as_me:32333: checking if address-list page should be used" >&5
+echo "$as_me:32365: checking if address-list page should be used" >&5
 echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -32347,14 +32379,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:32350: result: $use_addrlist_page" >&5
+echo "$as_me:32382: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:32357: checking if experimental CJK logic should be used" >&5
+echo "$as_me:32389: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -32371,14 +32403,14 @@ else
 	use_cjk=no
 
 fi;
-echo "$as_me:32374: result: $use_cjk" >&5
+echo "$as_me:32406: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no &&
 cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:32381: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:32413: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -32395,7 +32427,7 @@ else
 	use_ja_utf8=no
 
 fi;
-echo "$as_me:32398: result: $use_ja_utf8" >&5
+echo "$as_me:32430: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -32441,11 +32473,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32444 "configure"
+#line 32476 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -32453,16 +32485,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32459: \$? = $ac_status" >&5
+  echo "$as_me:32491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32465: \$? = $ac_status" >&5
+  echo "$as_me:32497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32479,7 +32511,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32482: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32514: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32522,11 +32554,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32525 "configure"
+#line 32557 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -32534,16 +32566,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32540: \$? = $ac_status" >&5
+  echo "$as_me:32572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32546: \$? = $ac_status" >&5
+  echo "$as_me:32578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32560,7 +32592,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32563: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32595: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32578,7 +32610,7 @@ echo "${as_me:-configure}:32563: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32581: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32613: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32603,7 +32635,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32606: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32638: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32632,7 +32664,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:32635: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32667: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32641,7 +32673,7 @@ echo "${as_me:-configure}:32635: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32644: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32676: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32652,7 +32684,7 @@ esac
 
 fi;
 
-  echo "$as_me:32655: checking for iconv" >&5
+  echo "$as_me:32687: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32663,19 +32695,19 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:32666: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32698: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32671 "configure"
+#line 32703 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -32687,16 +32719,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32722: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32693: \$? = $ac_status" >&5
+  echo "$as_me:32725: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32699: \$? = $ac_status" >&5
+  echo "$as_me:32731: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32710,14 +32742,14 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32713 "configure"
+#line 32745 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -32729,16 +32761,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32735: \$? = $ac_status" >&5
+  echo "$as_me:32767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32741: \$? = $ac_status" >&5
+  echo "$as_me:32773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32755,9 +32787,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:32758: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:32790: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:32760: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32792: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32848,18 +32880,18 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_iconv ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32851: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32883: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 32855 "configure"
+#line 32887 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -32871,21 +32903,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32877: \$? = $ac_status" >&5
+  echo "$as_me:32909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32883: \$? = $ac_status" >&5
+  echo "$as_me:32915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32888: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32920: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32903,7 +32935,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32906: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32938: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -32978,20 +33010,20 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_iconv ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32981: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:33013: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-liconv  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 32987 "configure"
+#line 33019 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 
 	iconv_t cd = iconv_open("","");
@@ -33003,21 +33035,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33009: \$? = $ac_status" >&5
+  echo "$as_me:33041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33015: \$? = $ac_status" >&5
+  echo "$as_me:33047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me:-configure}:33020: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:33052: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -33057,7 +33089,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:33060: result: $am_cv_func_iconv" >&5
+echo "$as_me:33092: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -33066,14 +33098,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:33069: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:33101: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 33076 "configure"
+#line 33108 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33090,7 +33122,7 @@ size_t iconv();
 #endif
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -33098,16 +33130,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33104: \$? = $ac_status" >&5
+  echo "$as_me:33136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33110: \$? = $ac_status" >&5
+  echo "$as_me:33142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -33117,7 +33149,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:33120: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:33152: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -33159,11 +33191,11 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33162 "configure"
+#line 33194 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -33171,16 +33203,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33177: \$? = $ac_status" >&5
+  echo "$as_me:33209: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33183: \$? = $ac_status" >&5
+  echo "$as_me:33215: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33197,7 +33229,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:33200: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33232: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33236,7 +33268,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33239: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33271: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33260,7 +33292,7 @@ case $cf_cv_screen in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:33263: checking if you want to use default-colors" >&5
+echo "$as_me:33295: checking if you want to use default-colors" >&5
 echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
@@ -33277,7 +33309,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:33280: result: $use_dft_colors" >&5
+echo "$as_me:33312: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -33286,7 +33318,7 @@ EOF
 
 fi
 
-echo "$as_me:33289: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:33321: checking if experimental keyboard-layout logic should be used" >&5
 echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
@@ -33303,14 +33335,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:33306: result: $use_kbd_layout" >&5
+echo "$as_me:33338: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
 test $use_kbd_layout != no &&
 cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:33313: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:33345: checking if experimental nested-table logic should be used" >&5
 echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
@@ -33327,14 +33359,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:33330: result: $use_nested_tables" >&5
+echo "$as_me:33362: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
 test $use_nested_tables != no &&
 cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:33337: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:33369: checking if alternative line-edit bindings should be used" >&5
 echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
@@ -33351,14 +33383,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:33354: result: $use_alt_bindings" >&5
+echo "$as_me:33386: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:33361: checking if ascii case-conversion should be used" >&5
+echo "$as_me:33393: checking if ascii case-conversion should be used" >&5
 echo $ECHO_N "checking if ascii case-conversion should be used... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -33375,14 +33407,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:33378: result: $use_ascii_ctypes" >&5
+echo "$as_me:33410: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:33385: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:33417: checking if you want to use extended HTML DTD logic" >&5
 echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
@@ -33399,14 +33431,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:33402: result: $use_ext_htmldtd" >&5
+echo "$as_me:33434: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
 test $use_ext_htmldtd = "no" &&
 cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:33409: checking if file-upload logic should be used" >&5
+echo "$as_me:33441: checking if file-upload logic should be used" >&5
 echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-file-upload or --disable-file-upload was given.
@@ -33423,14 +33455,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:33426: result: $use_file_upload" >&5
+echo "$as_me:33458: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
 test $use_file_upload != no &&
 cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:33433: checking if IDNA support should be used" >&5
+echo "$as_me:33465: checking if IDNA support should be used" >&5
 echo $ECHO_N "checking if IDNA support should be used... $ECHO_C" >&6
 
 # Check whether --enable-idna or --disable-idna was given.
@@ -33447,7 +33479,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:33450: result: $use_idna" >&5
+echo "$as_me:33482: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -33486,11 +33518,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33489 "configure"
+#line 33521 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -33498,16 +33530,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33504: \$? = $ac_status" >&5
+  echo "$as_me:33536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33510: \$? = $ac_status" >&5
+  echo "$as_me:33542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33524,7 +33556,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:33527: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33559: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33567,11 +33599,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33570 "configure"
+#line 33602 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -33579,16 +33611,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33582: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33585: \$? = $ac_status" >&5
+  echo "$as_me:33617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33591: \$? = $ac_status" >&5
+  echo "$as_me:33623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33605,7 +33637,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:33608: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33640: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33623,7 +33655,7 @@ echo "${as_me:-configure}:33608: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33626: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33658: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33648,7 +33680,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33651: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33683: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33677,7 +33709,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33680: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33712: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33686,7 +33718,7 @@ echo "${as_me:-configure}:33680: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33689: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33721: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33700,19 +33732,19 @@ esac
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:33703: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33735: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33708 "configure"
+#line 33740 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <idna.h>
 
 int
-main ()
+main (void)
 {
 
 	char *output = 0;
@@ -33723,16 +33755,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33729: \$? = $ac_status" >&5
+  echo "$as_me:33761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33735: \$? = $ac_status" >&5
+  echo "$as_me:33767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33746,14 +33778,14 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33749 "configure"
+#line 33781 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <idna.h>
 
 int
-main ()
+main (void)
 {
 
 	char *output = 0;
@@ -33764,16 +33796,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33799: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33770: \$? = $ac_status" >&5
+  echo "$as_me:33802: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33776: \$? = $ac_status" >&5
+  echo "$as_me:33808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33790,9 +33822,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:33793: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:33825: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:33795: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33827: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33883,18 +33915,18 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_idn ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33886: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33918: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 33890 "configure"
+#line 33922 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <idna.h>
 
 int
-main ()
+main (void)
 {
 
 	char *output = 0;
@@ -33905,21 +33937,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33940: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33911: \$? = $ac_status" >&5
+  echo "$as_me:33943: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33917: \$? = $ac_status" >&5
+  echo "$as_me:33949: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33922: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33954: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33937,7 +33969,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33940: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33972: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -34012,20 +34044,20 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_idn ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:34015: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:34047: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lidn $LIBICONV $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 34021 "configure"
+#line 34053 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <idna.h>
 
 int
-main ()
+main (void)
 {
 
 	char *output = 0;
@@ -34036,21 +34068,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34042: \$? = $ac_status" >&5
+  echo "$as_me:34074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34048: \$? = $ac_status" >&5
+  echo "$as_me:34080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:34053: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:34085: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -34109,11 +34141,11 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34112 "configure"
+#line 34144 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -34121,16 +34153,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34127: \$? = $ac_status" >&5
+  echo "$as_me:34159: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34133: \$? = $ac_status" >&5
+  echo "$as_me:34165: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34147,7 +34179,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34150: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34182: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34183,7 +34215,7 @@ if test -n "$cf_cv_library_path_idn" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:34186: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34218: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34208,7 +34240,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:34211: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:34243: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -34222,7 +34254,7 @@ fi
 
 fi
 
-echo "$as_me:34225: checking if element-justification logic should be used" >&5
+echo "$as_me:34257: checking if element-justification logic should be used" >&5
 echo $ECHO_N "checking if element-justification logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
@@ -34239,14 +34271,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:34242: result: $use_justify_elts" >&5
+echo "$as_me:34274: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no &&
 cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:34249: checking if partial-display should be used" >&5
+echo "$as_me:34281: checking if partial-display should be used" >&5
 echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6
 
 # Check whether --enable-partial or --disable-partial was given.
@@ -34263,14 +34295,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:34266: result: $use_partial_display" >&5
+echo "$as_me:34298: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
 test $use_partial_display != no &&
 cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:34273: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:34305: checking if persistent-cookie logic should be used" >&5
 echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
@@ -34287,14 +34319,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:34290: result: $use_filed_cookies" >&5
+echo "$as_me:34322: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
 test $use_filed_cookies != no &&
 cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:34297: checking if html source should be colorized" >&5
+echo "$as_me:34329: checking if html source should be colorized" >&5
 echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
@@ -34311,14 +34343,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:34314: result: $use_prettysrc" >&5
+echo "$as_me:34346: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
 test $use_prettysrc != no &&
 cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:34321: checking if progress-bar code should be used" >&5
+echo "$as_me:34353: checking if progress-bar code should be used" >&5
 echo $ECHO_N "checking if progress-bar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-progressbar or --disable-progressbar was given.
@@ -34335,14 +34367,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:34338: result: $use_progressbar" >&5
+echo "$as_me:34370: result: $use_progressbar" >&5
 echo "${ECHO_T}$use_progressbar" >&6
 test $use_progressbar != no &&
 cat >>confdefs.h <<\EOF
 #define USE_PROGRESSBAR 1
 EOF
 
-echo "$as_me:34345: checking if read-progress message should show ETA" >&5
+echo "$as_me:34377: checking if read-progress message should show ETA" >&5
 echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6
 
 # Check whether --enable-read-eta or --disable-read-eta was given.
@@ -34359,14 +34391,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:34362: result: $use_read_eta" >&5
+echo "$as_me:34394: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
 test $use_read_eta != no &&
 cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:34369: checking if source caching should be used" >&5
+echo "$as_me:34401: checking if source caching should be used" >&5
 echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
@@ -34383,14 +34415,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:34386: result: $use_source_cache" >&5
+echo "$as_me:34418: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
 test $use_source_cache != no &&
 cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:34393: checking if scrollbar code should be used" >&5
+echo "$as_me:34425: checking if scrollbar code should be used" >&5
 echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
@@ -34407,10 +34439,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:34410: result: $use_scrollbar" >&5
+echo "$as_me:34442: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:34413: checking if charset-selection logic should be used" >&5
+echo "$as_me:34445: checking if charset-selection logic should be used" >&5
 echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -34427,14 +34459,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:34430: result: $use_charset_choice" >&5
+echo "$as_me:34462: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no &&
 cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:34437: checking if you want to use external commands" >&5
+echo "$as_me:34469: checking if you want to use external commands" >&5
 echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6
 
 # Check whether --enable-externs or --disable-externs was given.
@@ -34451,7 +34483,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:34454: result: $use_externs" >&5
+echo "$as_me:34486: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -34462,7 +34494,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:34465: checking if you want to use setfont support" >&5
+echo "$as_me:34497: checking if you want to use setfont support" >&5
 echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
@@ -34479,7 +34511,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:34482: result: $use_setfont" >&5
+echo "$as_me:34514: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -34490,7 +34522,7 @@ for ac_prog in $SETFONT consolechars setfont
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:34493: checking for $ac_word" >&5
+echo "$as_me:34525: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_SETFONT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34507,7 +34539,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_SETFONT="$ac_dir/$ac_word"
-   echo "$as_me:34510: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34542: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34518,10 +34550,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:34521: result: $SETFONT" >&5
+  echo "$as_me:34553: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:34524: result: no" >&5
+  echo "$as_me:34556: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34580,7 +34612,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34583: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34615: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -34598,19 +34630,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:34601: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:34633: testing Assume $host_os has font-switching ..." 1>&5
 
 		;;
 	(*)
 		SETFONT=unknown
 		test -n "$verbose" && echo "	Assume $host_os has no font-switching" 1>&6
 
-echo "${as_me:-configure}:34608: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:34640: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:34613: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:34645: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -34621,7 +34653,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:34624: checking if you want cgi-link support" >&5
+echo "$as_me:34656: checking if you want cgi-link support" >&5
 echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
@@ -34638,10 +34670,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:34641: result: $enableval" >&5
+echo "$as_me:34673: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34644: checking if you want change-exec support" >&5
+echo "$as_me:34676: checking if you want change-exec support" >&5
 echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
@@ -34658,14 +34690,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:34661: result: $use_change_exec" >&5
+echo "$as_me:34693: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
 test $use_change_exec = yes &&
 cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:34668: checking if you want exec-links support" >&5
+echo "$as_me:34700: checking if you want exec-links support" >&5
 echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
@@ -34682,14 +34714,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:34685: result: $use_exec_links" >&5
+echo "$as_me:34717: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
 test $use_exec_links = yes &&
 cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:34692: checking if you want exec-scripts support" >&5
+echo "$as_me:34724: checking if you want exec-scripts support" >&5
 echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
@@ -34706,14 +34738,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:34709: result: $use_exec_scripts" >&5
+echo "$as_me:34741: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
 test $use_exec_scripts = yes &&
 cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:34716: checking if you want internal-links feature" >&5
+echo "$as_me:34748: checking if you want internal-links feature" >&5
 echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
@@ -34730,14 +34762,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:34733: result: $use_internal_links" >&5
+echo "$as_me:34765: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = yes &&
 cat >>confdefs.h <<\EOF
 #define TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:34740: checking if you want to fork NSL requests" >&5
+echo "$as_me:34772: checking if you want to fork NSL requests" >&5
 echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
@@ -34754,7 +34786,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:34757: result: $use_nsl_fork" >&5
+echo "$as_me:34789: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -34775,7 +34807,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:34778: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:34810: checking if you want to log URL requests via syslog" >&5
 echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6
 
 # Check whether --enable-syslog or --disable-syslog was given.
@@ -34792,14 +34824,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:34795: result: $use_syslog" >&5
+echo "$as_me:34827: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
 test $use_syslog = yes &&
 cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:34802: checking if you want to underline links" >&5
+echo "$as_me:34834: checking if you want to underline links" >&5
 echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6
 
 # Check whether --enable-underlines or --disable-underlines was given.
@@ -34816,7 +34848,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:34819: result: $use_underline" >&5
+echo "$as_me:34851: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34828,7 +34860,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34831: checking if help files should be gzip'ed" >&5
+echo "$as_me:34863: checking if help files should be gzip'ed" >&5
 echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
@@ -34845,10 +34877,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:34848: result: $use_gzip_help" >&5
+echo "$as_me:34880: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34851: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34883: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
 echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6
 
 # Check whether --with-bzlib or --without-bzlib was given.
@@ -34858,7 +34890,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:34861: result: $use_bzlib" >&5
+echo "$as_me:34893: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34897,11 +34929,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34900 "configure"
+#line 34932 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -34909,16 +34941,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34915: \$? = $ac_status" >&5
+  echo "$as_me:34947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34921: \$? = $ac_status" >&5
+  echo "$as_me:34953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34935,7 +34967,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:34938: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34970: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34978,11 +35010,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34981 "configure"
+#line 35013 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -34990,16 +35022,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35025: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34996: \$? = $ac_status" >&5
+  echo "$as_me:35028: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35002: \$? = $ac_status" >&5
+  echo "$as_me:35034: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35016,7 +35048,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35019: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35051: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35034,7 +35066,7 @@ echo "${as_me:-configure}:35019: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35037: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:35069: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35059,7 +35091,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35062: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35094: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35088,7 +35120,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35091: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35123: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35097,7 +35129,7 @@ echo "${as_me:-configure}:35091: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35100: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:35132: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35111,19 +35143,19 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:35114: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35146: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35119 "configure"
+#line 35151 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <bzlib.h>
 
 int
-main ()
+main (void)
 {
 
     BZ2_bzopen("name","mode")
@@ -35133,16 +35165,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35139: \$? = $ac_status" >&5
+  echo "$as_me:35171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35145: \$? = $ac_status" >&5
+  echo "$as_me:35177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35156,14 +35188,14 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35159 "configure"
+#line 35191 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <bzlib.h>
 
 int
-main ()
+main (void)
 {
 
     BZ2_bzopen("name","mode")
@@ -35173,16 +35205,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35179: \$? = $ac_status" >&5
+  echo "$as_me:35211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35185: \$? = $ac_status" >&5
+  echo "$as_me:35217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35199,9 +35231,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:35202: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:35234: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:35204: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35236: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35292,18 +35324,18 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_bz2 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:35295: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35327: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 35299 "configure"
+#line 35331 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <bzlib.h>
 
 int
-main ()
+main (void)
 {
 
     BZ2_bzopen("name","mode")
@@ -35313,21 +35345,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35316: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35348: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35319: \$? = $ac_status" >&5
+  echo "$as_me:35351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35325: \$? = $ac_status" >&5
+  echo "$as_me:35357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:35330: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35362: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35345,7 +35377,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:35348: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35380: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -35353,14 +35385,14 @@ echo "${as_me:-configure}:35348: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 35356 "configure"
+#line 35388 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <bzlib.h>
 
 int
-main ()
+main (void)
 {
 
     BZ2_bzopen("name","mode")
@@ -35370,21 +35402,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35376: \$? = $ac_status" >&5
+  echo "$as_me:35408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35382: \$? = $ac_status" >&5
+  echo "$as_me:35414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:35387: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:35419: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -35465,20 +35497,20 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_bz2 ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me:-configure}:35468: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35500: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lbz2  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_bz2"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 35474 "configure"
+#line 35506 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <bzlib.h>
 
 int
-main ()
+main (void)
 {
 
     BZ2_bzopen("name","mode")
@@ -35488,21 +35520,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35494: \$? = $ac_status" >&5
+  echo "$as_me:35526: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35500: \$? = $ac_status" >&5
+  echo "$as_me:35532: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found bz2 library in $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me:-configure}:35505: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35537: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -35561,11 +35593,11 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35564 "configure"
+#line 35596 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -35573,16 +35605,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35579: \$? = $ac_status" >&5
+  echo "$as_me:35611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35585: \$? = $ac_status" >&5
+  echo "$as_me:35617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35599,7 +35631,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35602: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35634: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35635,7 +35667,7 @@ if test -n "$cf_cv_library_path_bz2" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35638: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35670: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35660,7 +35692,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35663: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:35695: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -35671,7 +35703,7 @@ EOF
 
 fi
 
-echo "$as_me:35674: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:35706: checking if you want to use zlib for decompression of some gzip files" >&5
 echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6
 
 # Check whether --with-zlib or --without-zlib was given.
@@ -35681,7 +35713,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:35684: result: $use_zlib" >&5
+echo "$as_me:35716: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -35720,11 +35752,11 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35723 "configure"
+#line 35755 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -35732,16 +35764,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35735: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35738: \$? = $ac_status" >&5
+  echo "$as_me:35770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35744: \$? = $ac_status" >&5
+  echo "$as_me:35776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35758,7 +35790,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35761: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35793: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35801,11 +35833,11 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35804 "configure"
+#line 35836 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -35813,16 +35845,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35819: \$? = $ac_status" >&5
+  echo "$as_me:35851: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35825: \$? = $ac_status" >&5
+  echo "$as_me:35857: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35839,7 +35871,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:35842: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35874: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35857,7 +35889,7 @@ echo "${as_me:-configure}:35842: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35860: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35892: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35882,7 +35914,7 @@ if test -n "$cf_searchpath/lib" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35885: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35917: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35911,7 +35943,7 @@ if test -n "$cf_searchpath" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:35914: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35946: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35920,7 +35952,7 @@ echo "${as_me:-configure}:35914: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35923: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35955: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35934,18 +35966,18 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35937: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35969: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35942 "configure"
+#line 35974 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
 
 int
-main ()
+main (void)
 {
 
 	gzopen("name","mode")
@@ -35955,16 +35987,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35961: \$? = $ac_status" >&5
+  echo "$as_me:35993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35967: \$? = $ac_status" >&5
+  echo "$as_me:35999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35978,13 +36010,13 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35981 "configure"
+#line 36013 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
 
 int
-main ()
+main (void)
 {
 
 	gzopen("name","mode")
@@ -35994,16 +36026,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36000: \$? = $ac_status" >&5
+  echo "$as_me:36032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36006: \$? = $ac_status" >&5
+  echo "$as_me:36038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -36020,9 +36052,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:36023: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:36055: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:36025: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:36057: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36113,17 +36145,17 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_z ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:36116: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:36148: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 36120 "configure"
+#line 36152 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
 
 int
-main ()
+main (void)
 {
 
 	gzopen("name","mode")
@@ -36133,21 +36165,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36139: \$? = $ac_status" >&5
+  echo "$as_me:36171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36145: \$? = $ac_status" >&5
+  echo "$as_me:36177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found z headers in $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:36150: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:36182: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36165,7 +36197,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:36168: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:36200: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -36173,13 +36205,13 @@ echo "${as_me:-configure}:36168: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 36176 "configure"
+#line 36208 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
 
 int
-main ()
+main (void)
 {
 
 	gzopen("name","mode")
@@ -36189,21 +36221,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36195: \$? = $ac_status" >&5
+  echo "$as_me:36227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36201: \$? = $ac_status" >&5
+  echo "$as_me:36233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:36206: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:36238: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -36284,19 +36316,19 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_z ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_z" 1>&6
 
-echo "${as_me:-configure}:36287: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:36319: testing ... testing $cf_cv_library_path_z ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lz  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_z"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 36293 "configure"
+#line 36325 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
 
 int
-main ()
+main (void)
 {
 
 	gzopen("name","mode")
@@ -36306,21 +36338,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36312: \$? = $ac_status" >&5
+  echo "$as_me:36344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36318: \$? = $ac_status" >&5
+  echo "$as_me:36350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found z library in $cf_cv_library_path_z" 1>&6
 
-echo "${as_me:-configure}:36323: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:36355: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -36379,11 +36411,11 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 36382 "configure"
+#line 36414 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello")
   ;
@@ -36391,16 +36423,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36397: \$? = $ac_status" >&5
+  echo "$as_me:36429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36403: \$? = $ac_status" >&5
+  echo "$as_me:36435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -36417,7 +36449,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:36420: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:36452: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36453,7 +36485,7 @@ if test -n "$cf_cv_library_path_z" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:36456: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:36488: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -36478,7 +36510,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:36481: WARNING: Cannot find z library" >&5
+{ echo "$as_me:36513: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -36487,13 +36519,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36490: checking for $ac_func" >&5
+echo "$as_me:36522: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 36496 "configure"
+#line 36528 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -36508,7 +36540,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -36524,16 +36556,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36530: \$? = $ac_status" >&5
+  echo "$as_me:36562: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36536: \$? = $ac_status" >&5
+  echo "$as_me:36568: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36543,7 +36575,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36546: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:36578: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -36560,7 +36592,7 @@ EOF
 
 fi
 
-echo "$as_me:36563: checking if you want to exclude FINGER code" >&5
+echo "$as_me:36595: checking if you want to exclude FINGER code" >&5
 echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6
 
 # Check whether --enable-finger or --disable-finger was given.
@@ -36577,14 +36609,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:36580: result: $use_finger" >&5
+echo "$as_me:36612: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
 test $use_finger != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:36587: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:36619: checking if you want to exclude GOPHER code" >&5
 echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6
 
 # Check whether --enable-gopher or --disable-gopher was given.
@@ -36601,14 +36633,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:36604: result: $use_gopher" >&5
+echo "$as_me:36636: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
 test $use_gopher != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:36611: checking if you want to exclude NEWS code" >&5
+echo "$as_me:36643: checking if you want to exclude NEWS code" >&5
 echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6
 
 # Check whether --enable-news or --disable-news was given.
@@ -36625,14 +36657,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:36628: result: $use_news" >&5
+echo "$as_me:36660: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
 test $use_news != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:36635: checking if you want to exclude FTP code" >&5
+echo "$as_me:36667: checking if you want to exclude FTP code" >&5
 echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6
 
 # Check whether --enable-ftp or --disable-ftp was given.
@@ -36649,14 +36681,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:36652: result: $use_ftp" >&5
+echo "$as_me:36684: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:36659: checking if you want to include WAIS code" >&5
+echo "$as_me:36691: checking if you want to include WAIS code" >&5
 echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6
 
 # Check whether --enable-wais or --disable-wais was given.
@@ -36673,13 +36705,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:36676: result: $use_wais" >&5
+echo "$as_me:36708: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:36682: checking for fs_free in -lwais" >&5
+	echo "$as_me:36714: checking for fs_free in -lwais" >&5
 echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6
 if test "${ac_cv_lib_wais_fs_free+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36687,7 +36719,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36690 "configure"
+#line 36722 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36698,7 +36730,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char fs_free ();
 int
-main ()
+main (void)
 {
 fs_free ();
   ;
@@ -36706,16 +36738,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36712: \$? = $ac_status" >&5
+  echo "$as_me:36744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36718: \$? = $ac_status" >&5
+  echo "$as_me:36750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -36726,18 +36758,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36729: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:36761: result: $ac_cv_lib_wais_fs_free" >&5
 echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6
 if test $ac_cv_lib_wais_fs_free = yes; then
 
-echo "$as_me:36733: checking if -lm needed for math functions" >&5
+echo "$as_me:36765: checking if -lm needed for math functions" >&5
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 36740 "configure"
+#line 36772 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -36745,7 +36777,7 @@ else
 	#include <math.h>
 
 int
-main ()
+main (void)
 {
 double x = rand(); printf("result = %g\n", sin(x))
   ;
@@ -36753,16 +36785,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36759: \$? = $ac_status" >&5
+  echo "$as_me:36791: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36765: \$? = $ac_status" >&5
+  echo "$as_me:36797: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -36772,7 +36804,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36775: result: $cf_cv_need_libm" >&5
+echo "$as_me:36807: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -36814,23 +36846,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36817: checking for $ac_header" >&5
+echo "$as_me:36849: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 36823 "configure"
+#line 36855 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36827: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36859: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:36833: \$? = $ac_status" >&5
+  echo "$as_me:36865: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36849,7 +36881,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36852: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36884: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -36862,7 +36894,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36865: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36897: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36870,7 +36902,7 @@ fi
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:36873: checking if directory-editor code should be used" >&5
+echo "$as_me:36905: checking if directory-editor code should be used" >&5
 echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6
 
 # Check whether --enable-dired or --disable-dired was given.
@@ -36887,7 +36919,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:36890: result: $use_dired" >&5
+echo "$as_me:36922: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36897,7 +36929,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36900: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36932: checking if you wish to allow extracting from archives via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
@@ -36914,10 +36946,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36917: result: $enableval" >&5
+	echo "$as_me:36949: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36920: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36952: checking if DirEd mode should override keys" >&5
 echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6
 
 # Check whether --enable-dired-override or --disable-dired-override was given.
@@ -36941,10 +36973,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36944: result: $enableval" >&5
+	echo "$as_me:36976: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36947: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36979: checking if you wish to allow permissions commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
@@ -36968,10 +37000,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36971: result: $enableval" >&5
+	echo "$as_me:37003: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36974: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:37006: checking if you wish to allow executable-permission commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
@@ -36988,10 +37020,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36991: result: $enableval" >&5
+	echo "$as_me:37023: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36994: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:37026: checking if you wish to allow \"tar\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
@@ -37015,10 +37047,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37018: result: $enableval" >&5
+	echo "$as_me:37050: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37021: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:37053: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
@@ -37042,10 +37074,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37045: result: $enableval" >&5
+	echo "$as_me:37077: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37048: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:37080: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
@@ -37069,10 +37101,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37072: result: $enableval" >&5
+	echo "$as_me:37104: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37075: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:37107: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
@@ -37096,11 +37128,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37099: result: $enableval" >&5
+	echo "$as_me:37131: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:37103: checking if you want long-directory listings" >&5
+echo "$as_me:37135: checking if you want long-directory listings" >&5
 echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6
 
 # Check whether --enable-long-list or --disable-long-list was given.
@@ -37124,10 +37156,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:37127: result: $enableval" >&5
+echo "$as_me:37159: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:37130: checking if parent-directory references are permitted" >&5
+echo "$as_me:37162: checking if parent-directory references are permitted" >&5
 echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
@@ -37144,7 +37176,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:37147: result: $enableval" >&5
+echo "$as_me:37179: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -37152,7 +37184,7 @@ for ac_prog in $TELNET telnet
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37155: checking for $ac_word" >&5
+echo "$as_me:37187: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TELNET+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37169,7 +37201,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TELNET="$ac_dir/$ac_word"
-   echo "$as_me:37172: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37204: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37180,10 +37212,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:37183: result: $TELNET" >&5
+  echo "$as_me:37215: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:37186: result: no" >&5
+  echo "$as_me:37218: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37242,7 +37274,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37245: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37277: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -37260,7 +37292,7 @@ for ac_prog in $TN3270 tn3270
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37263: checking for $ac_word" >&5
+echo "$as_me:37295: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TN3270+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37277,7 +37309,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TN3270="$ac_dir/$ac_word"
-   echo "$as_me:37280: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37312: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37288,10 +37320,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:37291: result: $TN3270" >&5
+  echo "$as_me:37323: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:37294: result: no" >&5
+  echo "$as_me:37326: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37350,7 +37382,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37353: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37385: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -37368,7 +37400,7 @@ for ac_prog in $RLOGIN rlogin
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37371: checking for $ac_word" >&5
+echo "$as_me:37403: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RLOGIN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37385,7 +37417,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RLOGIN="$ac_dir/$ac_word"
-   echo "$as_me:37388: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37420: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37396,10 +37428,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:37399: result: $RLOGIN" >&5
+  echo "$as_me:37431: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:37402: result: no" >&5
+  echo "$as_me:37434: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37458,7 +37490,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37461: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37493: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -37476,7 +37508,7 @@ for ac_prog in $MV mv
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37479: checking for $ac_word" >&5
+echo "$as_me:37511: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MV+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37493,7 +37525,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_MV="$ac_dir/$ac_word"
-   echo "$as_me:37496: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37528: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37504,10 +37536,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:37507: result: $MV" >&5
+  echo "$as_me:37539: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:37510: result: no" >&5
+  echo "$as_me:37542: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37566,7 +37598,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37569: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37601: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -37584,7 +37616,7 @@ for ac_prog in $GZIP gzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37587: checking for $ac_word" >&5
+echo "$as_me:37619: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37601,7 +37633,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:37604: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37636: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37612,10 +37644,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:37615: result: $GZIP" >&5
+  echo "$as_me:37647: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:37618: result: no" >&5
+  echo "$as_me:37650: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37674,7 +37706,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37677: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37709: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -37692,7 +37724,7 @@ for ac_prog in $UNCOMPRESS gunzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37695: checking for $ac_word" >&5
+echo "$as_me:37727: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNCOMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37709,7 +37741,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:37712: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37744: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37720,10 +37752,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:37723: result: $UNCOMPRESS" >&5
+  echo "$as_me:37755: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:37726: result: no" >&5
+  echo "$as_me:37758: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37782,7 +37814,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37785: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37817: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -37800,7 +37832,7 @@ for ac_prog in $UNZIP unzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37803: checking for $ac_word" >&5
+echo "$as_me:37835: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37817,7 +37849,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNZIP="$ac_dir/$ac_word"
-   echo "$as_me:37820: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37852: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37828,10 +37860,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:37831: result: $UNZIP" >&5
+  echo "$as_me:37863: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37834: result: no" >&5
+  echo "$as_me:37866: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37890,7 +37922,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37893: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37925: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37908,7 +37940,7 @@ for ac_prog in $BZIP2 bzip2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:37911: checking for $ac_word" >&5
+echo "$as_me:37943: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BZIP2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37925,7 +37957,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_BZIP2="$ac_dir/$ac_word"
-   echo "$as_me:37928: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37960: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37936,10 +37968,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37939: result: $BZIP2" >&5
+  echo "$as_me:37971: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37942: result: no" >&5
+  echo "$as_me:37974: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37998,7 +38030,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38001: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38033: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -38016,7 +38048,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38019: checking for $ac_word" >&5
+echo "$as_me:38051: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38033,7 +38065,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TAR="$ac_dir/$ac_word"
-   echo "$as_me:38036: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38068: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38044,10 +38076,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:38047: result: $TAR" >&5
+  echo "$as_me:38079: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:38050: result: no" >&5
+  echo "$as_me:38082: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38106,7 +38138,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38109: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38141: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -38164,7 +38196,7 @@ for ac_prog in $COMPRESS compress
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38167: checking for $ac_word" >&5
+echo "$as_me:38199: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_COMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38181,7 +38213,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:38184: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38216: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38192,10 +38224,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:38195: result: $COMPRESS" >&5
+  echo "$as_me:38227: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:38198: result: no" >&5
+  echo "$as_me:38230: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38254,7 +38286,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38257: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38289: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -38272,7 +38304,7 @@ for ac_prog in $RM rm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38275: checking for $ac_word" >&5
+echo "$as_me:38307: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38289,7 +38321,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RM="$ac_dir/$ac_word"
-   echo "$as_me:38292: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38324: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38300,10 +38332,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:38303: result: $RM" >&5
+  echo "$as_me:38335: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:38306: result: no" >&5
+  echo "$as_me:38338: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38362,7 +38394,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38365: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38397: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -38380,7 +38412,7 @@ for ac_prog in $UUDECODE uudecode
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38383: checking for $ac_word" >&5
+echo "$as_me:38415: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UUDECODE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38397,7 +38429,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UUDECODE="$ac_dir/$ac_word"
-   echo "$as_me:38400: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38432: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38408,10 +38440,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:38411: result: $UUDECODE" >&5
+  echo "$as_me:38443: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:38414: result: no" >&5
+  echo "$as_me:38446: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38470,7 +38502,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38473: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38505: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -38488,7 +38520,7 @@ for ac_prog in $ZCAT zcat
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38491: checking for $ac_word" >&5
+echo "$as_me:38523: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZCAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38505,7 +38537,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZCAT="$ac_dir/$ac_word"
-   echo "$as_me:38508: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38540: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38516,10 +38548,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:38519: result: $ZCAT" >&5
+  echo "$as_me:38551: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:38522: result: no" >&5
+  echo "$as_me:38554: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38578,7 +38610,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38581: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38613: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -38596,7 +38628,7 @@ for ac_prog in $ZIP zip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38599: checking for $ac_word" >&5
+echo "$as_me:38631: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38613,7 +38645,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZIP="$ac_dir/$ac_word"
-   echo "$as_me:38616: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38648: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38624,10 +38656,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:38627: result: $ZIP" >&5
+  echo "$as_me:38659: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:38630: result: no" >&5
+  echo "$as_me:38662: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38686,7 +38718,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38689: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38721: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -38714,7 +38746,7 @@ for ac_prog in $INSTALL install
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38717: checking for $ac_word" >&5
+echo "$as_me:38749: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38731,7 +38763,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INSTALL="$ac_dir/$ac_word"
-   echo "$as_me:38734: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38766: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38742,10 +38774,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:38745: result: $INSTALL" >&5
+  echo "$as_me:38777: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:38748: result: no" >&5
+  echo "$as_me:38780: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38804,7 +38836,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38807: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38839: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38834,7 +38866,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in
 	(mingw*)
 
-echo "$as_me:38837: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38869: checking for initscr in -lpdcurses" >&5
 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38842,7 +38874,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38845 "configure"
+#line 38877 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38853,7 +38885,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char initscr ();
 int
-main ()
+main (void)
 {
 initscr ();
   ;
@@ -38861,16 +38893,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38867: \$? = $ac_status" >&5
+  echo "$as_me:38899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38873: \$? = $ac_status" >&5
+  echo "$as_me:38905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38881,7 +38913,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38884: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38916: result: $ac_cv_lib_pdcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
 if test $ac_cv_lib_pdcurses_initscr = yes; then
 
@@ -38903,13 +38935,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38906: checking for winwstr" >&5
+	echo "$as_me:38938: checking for winwstr" >&5
 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
 if test "${ac_cv_func_winwstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38912 "configure"
+#line 38944 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38924,7 +38956,7 @@ char winwstr ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -38940,16 +38972,16 @@ f = winwstr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38943: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38975: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38946: \$? = $ac_status" >&5
+  echo "$as_me:38978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38952: \$? = $ac_status" >&5
+  echo "$as_me:38984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38959,7 +38991,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38962: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38994: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test $ac_cv_func_winwstr = yes; then
   cat >>confdefs.h <<\EOF
@@ -38968,13 +39000,13 @@ EOF
 
 fi
 
-	echo "$as_me:38971: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:39003: checking for pdcurses_dll_iname" >&5
 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38977 "configure"
+#line 39009 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -38989,7 +39021,7 @@ char pdcurses_dll_iname ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -39005,16 +39037,16 @@ f = pdcurses_dll_iname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39011: \$? = $ac_status" >&5
+  echo "$as_me:39043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39017: \$? = $ac_status" >&5
+  echo "$as_me:39049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -39024,7 +39056,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39027: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:39059: result: $ac_cv_func_pdcurses_dll_iname" >&5
 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
 if test $ac_cv_func_pdcurses_dll_iname = yes; then
   cat >>confdefs.h <<\EOF
@@ -39037,7 +39069,7 @@ fi
 
 		;;
 	(*)
-		echo "$as_me:39040: checking for X" >&5
+		echo "$as_me:39072: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -39134,17 +39166,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 39137 "configure"
+#line 39169 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:39141: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39173: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:39147: \$? = $ac_status" >&5
+  echo "$as_me:39179: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39177,11 +39209,11 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 39180 "configure"
+#line 39212 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
-main ()
+main (void)
 {
 XtMalloc (0)
   ;
@@ -39189,16 +39221,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39195: \$? = $ac_status" >&5
+  echo "$as_me:39227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39201: \$? = $ac_status" >&5
+  echo "$as_me:39233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -39236,7 +39268,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:39239: result: $have_x" >&5
+  echo "$as_me:39271: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -39246,7 +39278,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:39249: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:39281: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -39270,15 +39302,15 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:39273: checking whether -R must be followed by a space" >&5
+      echo "$as_me:39305: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 39277 "configure"
+#line 39309 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -39286,16 +39318,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39292: \$? = $ac_status" >&5
+  echo "$as_me:39324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39298: \$? = $ac_status" >&5
+  echo "$as_me:39330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -39305,17 +39337,17 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:39308: result: no" >&5
+	echo "$as_me:39340: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39314 "configure"
+#line 39346 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -39323,16 +39355,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39329: \$? = $ac_status" >&5
+  echo "$as_me:39361: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39335: \$? = $ac_status" >&5
+  echo "$as_me:39367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -39342,11 +39374,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:39345: result: yes" >&5
+	  echo "$as_me:39377: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:39349: result: neither works" >&5
+	  echo "$as_me:39381: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -39366,7 +39398,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 39369 "configure"
+#line 39401 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39377,7 +39409,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char XOpenDisplay ();
 int
-main ()
+main (void)
 {
 XOpenDisplay ();
   ;
@@ -39385,22 +39417,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39391: \$? = $ac_status" >&5
+  echo "$as_me:39423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39397: \$? = $ac_status" >&5
+  echo "$as_me:39429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:39403: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:39435: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39408,7 +39440,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39411 "configure"
+#line 39443 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39419,7 +39451,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char dnet_ntoa ();
 int
-main ()
+main (void)
 {
 dnet_ntoa ();
   ;
@@ -39427,16 +39459,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39433: \$? = $ac_status" >&5
+  echo "$as_me:39465: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39439: \$? = $ac_status" >&5
+  echo "$as_me:39471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -39447,14 +39479,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39450: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:39482: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:39457: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:39489: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39462,7 +39494,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39465 "configure"
+#line 39497 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39473,7 +39505,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char dnet_ntoa ();
 int
-main ()
+main (void)
 {
 dnet_ntoa ();
   ;
@@ -39481,16 +39513,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39516: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39487: \$? = $ac_status" >&5
+  echo "$as_me:39519: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39493: \$? = $ac_status" >&5
+  echo "$as_me:39525: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -39501,7 +39533,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39504: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:39536: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -39520,13 +39552,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:39523: checking for gethostbyname" >&5
+    echo "$as_me:39555: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39529 "configure"
+#line 39561 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -39541,7 +39573,7 @@ char gethostbyname ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -39557,16 +39589,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39563: \$? = $ac_status" >&5
+  echo "$as_me:39595: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39569: \$? = $ac_status" >&5
+  echo "$as_me:39601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -39576,11 +39608,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39579: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:39611: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:39583: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:39615: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39588,7 +39620,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39591 "configure"
+#line 39623 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39599,7 +39631,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
-main ()
+main (void)
 {
 gethostbyname ();
   ;
@@ -39607,16 +39639,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39613: \$? = $ac_status" >&5
+  echo "$as_me:39645: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39619: \$? = $ac_status" >&5
+  echo "$as_me:39651: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -39627,14 +39659,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39630: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:39662: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:39637: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:39669: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39642,7 +39674,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39645 "configure"
+#line 39677 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39653,7 +39685,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
-main ()
+main (void)
 {
 gethostbyname ();
   ;
@@ -39661,16 +39693,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39667: \$? = $ac_status" >&5
+  echo "$as_me:39699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39673: \$? = $ac_status" >&5
+  echo "$as_me:39705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -39681,7 +39713,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39684: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:39716: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -39697,13 +39729,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:39700: checking for connect" >&5
+    echo "$as_me:39732: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39706 "configure"
+#line 39738 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -39718,7 +39750,7 @@ char connect ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -39734,16 +39766,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39740: \$? = $ac_status" >&5
+  echo "$as_me:39772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39746: \$? = $ac_status" >&5
+  echo "$as_me:39778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -39753,11 +39785,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39756: result: $ac_cv_func_connect" >&5
+echo "$as_me:39788: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:39760: checking for connect in -lsocket" >&5
+      echo "$as_me:39792: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39765,7 +39797,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39768 "configure"
+#line 39800 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39776,7 +39808,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char connect ();
 int
-main ()
+main (void)
 {
 connect ();
   ;
@@ -39784,16 +39816,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39790: \$? = $ac_status" >&5
+  echo "$as_me:39822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39796: \$? = $ac_status" >&5
+  echo "$as_me:39828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -39804,7 +39836,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39807: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:39839: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -39813,13 +39845,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:39816: checking for remove" >&5
+    echo "$as_me:39848: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39822 "configure"
+#line 39854 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39834,7 +39866,7 @@ char remove ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -39850,16 +39882,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39856: \$? = $ac_status" >&5
+  echo "$as_me:39888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39862: \$? = $ac_status" >&5
+  echo "$as_me:39894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39869,11 +39901,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39872: result: $ac_cv_func_remove" >&5
+echo "$as_me:39904: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:39876: checking for remove in -lposix" >&5
+      echo "$as_me:39908: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39881,7 +39913,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39884 "configure"
+#line 39916 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39892,7 +39924,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char remove ();
 int
-main ()
+main (void)
 {
 remove ();
   ;
@@ -39900,16 +39932,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39906: \$? = $ac_status" >&5
+  echo "$as_me:39938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39912: \$? = $ac_status" >&5
+  echo "$as_me:39944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39920,7 +39952,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39923: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39955: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -39929,13 +39961,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39932: checking for shmat" >&5
+    echo "$as_me:39964: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39938 "configure"
+#line 39970 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39950,7 +39982,7 @@ char shmat ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -39966,16 +39998,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40001: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39972: \$? = $ac_status" >&5
+  echo "$as_me:40004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39978: \$? = $ac_status" >&5
+  echo "$as_me:40010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -39985,11 +40017,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39988: result: $ac_cv_func_shmat" >&5
+echo "$as_me:40020: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:39992: checking for shmat in -lipc" >&5
+      echo "$as_me:40024: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39997,7 +40029,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40000 "configure"
+#line 40032 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40008,7 +40040,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char shmat ();
 int
-main ()
+main (void)
 {
 shmat ();
   ;
@@ -40016,16 +40048,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40022: \$? = $ac_status" >&5
+  echo "$as_me:40054: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40028: \$? = $ac_status" >&5
+  echo "$as_me:40060: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -40036,7 +40068,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40039: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:40071: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -40054,7 +40086,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:40057: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:40089: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40062,7 +40094,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40065 "configure"
+#line 40097 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40073,7 +40105,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char IceConnectionNumber ();
 int
-main ()
+main (void)
 {
 IceConnectionNumber ();
   ;
@@ -40081,16 +40113,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40084: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40087: \$? = $ac_status" >&5
+  echo "$as_me:40119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40093: \$? = $ac_status" >&5
+  echo "$as_me:40125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -40101,7 +40133,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40104: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:40136: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -40113,7 +40145,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:40116: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:40148: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -40124,14 +40156,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:40127: result: yes" >&5
+	echo "$as_me:40159: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40130: result: no" >&5
+	echo "$as_me:40162: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40134: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:40166: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -40142,14 +40174,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:40145: result: yes" >&5
+	echo "$as_me:40177: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40148: result: no" >&5
+	echo "$as_me:40180: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40152: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:40184: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -40160,14 +40192,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:40163: result: yes" >&5
+	echo "$as_me:40195: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40166: result: no" >&5
+	echo "$as_me:40198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40170: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:40202: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -40178,10 +40210,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:40181: result: yes" >&5
+	echo "$as_me:40213: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40184: result: no" >&5
+	echo "$as_me:40216: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40201,17 +40233,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:40204: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:40236: testing found package $cf_athena_pkg ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40210: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40242: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40214: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40246: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40342,26 +40374,26 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:40345: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:40377: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:40351: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:40383: checking for usable $cf_x_athena/Xmu package" >&5
 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 40358 "configure"
+#line 40390 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
 
 int
-main ()
+main (void)
 {
 
 int check = XmuCompareISOLatin1("big", "small")
@@ -40371,16 +40403,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40377: \$? = $ac_status" >&5
+  echo "$as_me:40409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40383: \$? = $ac_status" >&5
+  echo "$as_me:40415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -40390,7 +40422,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40393: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:40425: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -40402,7 +40434,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:40405: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:40437: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -40410,17 +40442,17 @@ echo "${as_me:-configure}:40405: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:40413: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:40445: testing found package xmu ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40419: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40451: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40423: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40455: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40540,12 +40572,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40543: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40575: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:40548: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40580: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -40553,12 +40585,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40556: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40588: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:40561: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40593: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40569,7 +40601,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:40572: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:40604: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -40594,17 +40626,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:40597: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:40629: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40603: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40635: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40607: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40639: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40725,7 +40757,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:40728: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:40760: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40733,7 +40765,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40736 "configure"
+#line 40768 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40744,7 +40776,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char XextCreateExtension ();
 int
-main ()
+main (void)
 {
 XextCreateExtension ();
   ;
@@ -40752,16 +40784,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40758: \$? = $ac_status" >&5
+  echo "$as_me:40790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40764: \$? = $ac_status" >&5
+  echo "$as_me:40796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -40772,7 +40804,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40775: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:40807: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
 
@@ -40808,17 +40840,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:40811: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40843: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40817: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40849: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40821: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40853: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40938,24 +40970,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40941: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:40973: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:40948: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40980: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40954: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40986: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40958: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40990: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41075,24 +41107,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41078: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:41110: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:41085: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41117: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41091: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41123: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41095: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41127: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41212,24 +41244,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41215: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:41247: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:41222: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:41254: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41228: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41260: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41232: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41264: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41349,7 +41381,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41352: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:41384: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -41360,17 +41392,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:41363: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:41395: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41369: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41401: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41373: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41405: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41491,20 +41523,20 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:41494: checking for usable X dependency" >&5
+echo "$as_me:41526: checking for usable X dependency" >&5
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 41501 "configure"
+#line 41533 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
 
 int
-main ()
+main (void)
 {
 
 	int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0);
@@ -41517,16 +41549,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41552: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41523: \$? = $ac_status" >&5
+  echo "$as_me:41555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41529: \$? = $ac_status" >&5
+  echo "$as_me:41561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -41536,30 +41568,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41539: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:41571: result: $cf_cv_xt_x11_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
 		if test "$cf_cv_xt_x11_compat" = no
 		then
 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
 
-echo "${as_me:-configure}:41545: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:41577: testing work around broken X11 dependency ..." 1>&5
 
 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:41552: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:41584: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41558: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41590: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41562: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41594: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41682,12 +41714,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41685: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:41717: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41690: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:41722: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41695,20 +41727,20 @@ fi
 		;;
 	esac
 
-echo "$as_me:41698: checking for usable X Toolkit package" >&5
+echo "$as_me:41730: checking for usable X Toolkit package" >&5
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 41705 "configure"
+#line 41737 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
 
 int
-main ()
+main (void)
 {
 int num = IceConnectionNumber(0)
 
@@ -41717,16 +41749,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41723: \$? = $ac_status" >&5
+  echo "$as_me:41755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41729: \$? = $ac_status" >&5
+  echo "$as_me:41761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -41736,7 +41768,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41739: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:41771: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -41750,22 +41782,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:41753: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:41785: testing work around broken ICE dependency ..." 1>&5
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:41758: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:41790: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41764: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41796: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41768: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41800: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41884,17 +41916,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:41887: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41919: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41893: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41925: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41897: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41929: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -42023,12 +42055,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:42026: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:42058: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:42031: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:42063: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -42048,7 +42080,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42051: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42083: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42133,7 +42165,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:42136: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42168: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -42143,7 +42175,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:42146: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42178: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -42153,7 +42185,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:42156: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42188: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -42162,11 +42194,11 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42165 "configure"
+#line 42197 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello world");
   ;
@@ -42174,16 +42206,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42180: \$? = $ac_status" >&5
+  echo "$as_me:42212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42186: \$? = $ac_status" >&5
+  echo "$as_me:42218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42191,12 +42223,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42194: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42226: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:42199: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42231: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42204,13 +42236,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:42207: checking for XOpenDisplay" >&5
+	echo "$as_me:42239: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42213 "configure"
+#line 42245 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -42225,7 +42257,7 @@ char XOpenDisplay ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -42241,16 +42273,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42247: \$? = $ac_status" >&5
+  echo "$as_me:42279: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42253: \$? = $ac_status" >&5
+  echo "$as_me:42285: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -42260,13 +42292,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42263: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:42295: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
-	echo "$as_me:42269: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:42301: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42274,7 +42306,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42277 "configure"
+#line 42309 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42285,7 +42317,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char XOpenDisplay ();
 int
-main ()
+main (void)
 {
 XOpenDisplay ();
   ;
@@ -42293,16 +42325,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42299: \$? = $ac_status" >&5
+  echo "$as_me:42331: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42305: \$? = $ac_status" >&5
+  echo "$as_me:42337: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -42313,7 +42345,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42316: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42348: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
 
@@ -42337,13 +42369,13 @@ fi
 
 fi
 
-	echo "$as_me:42340: checking for XtAppInitialize" >&5
+	echo "$as_me:42372: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42346 "configure"
+#line 42378 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -42358,7 +42390,7 @@ char XtAppInitialize ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -42374,16 +42406,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42380: \$? = $ac_status" >&5
+  echo "$as_me:42412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42386: \$? = $ac_status" >&5
+  echo "$as_me:42418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -42393,13 +42425,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42396: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:42428: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
-	echo "$as_me:42402: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:42434: checking for XtAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42407,7 +42439,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42410 "configure"
+#line 42442 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42418,7 +42450,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char XtAppInitialize ();
 int
-main ()
+main (void)
 {
 XtAppInitialize ();
   ;
@@ -42426,16 +42458,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42432: \$? = $ac_status" >&5
+  echo "$as_me:42464: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42438: \$? = $ac_status" >&5
+  echo "$as_me:42470: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -42446,7 +42478,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42449: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:42481: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
 
@@ -42463,7 +42495,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:42466: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:42498: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -42485,20 +42517,20 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:42488: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:42520: checking for $cf_test in $cf_path" >&5
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
 		else
-			echo "$as_me:42491: checking for $cf_test" >&5
+			echo "$as_me:42523: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42495 "configure"
+#line 42527 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include <$cf_test>
 int
-main ()
+main (void)
 {
 
   ;
@@ -42506,16 +42538,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42512: \$? = $ac_status" >&5
+  echo "$as_me:42544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42518: \$? = $ac_status" >&5
+  echo "$as_me:42550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -42524,7 +42556,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:42527: result: $cf_result" >&5
+		echo "$as_me:42559: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -42536,7 +42568,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:42539: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:42571: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -42582,7 +42614,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:42585: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:42617: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -42602,18 +42634,18 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:42605: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:42637: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 42609 "configure"
+#line 42641 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include <X11/$cf_x_athena_root/SimpleMenu.h>
 
 int
-main ()
+main (void)
 {
 
 $cf_test((XtAppContext) 0)
@@ -42622,16 +42654,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42657: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42628: \$? = $ac_status" >&5
+  echo "$as_me:42660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42634: \$? = $ac_status" >&5
+  echo "$as_me:42666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -42640,7 +42672,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:42643: result: $cf_result" >&5
+			echo "$as_me:42675: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -42654,7 +42686,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:42657: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:42689: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -42672,7 +42704,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:42675: checking for $ac_word" >&5
+echo "$as_me:42707: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42687,7 +42719,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:42690: found $ac_dir/$ac_word" >&5
+echo "$as_me:42722: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42695,10 +42727,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:42698: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:42730: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42701: result: no" >&5
+  echo "$as_me:42733: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42711,7 +42743,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:42714: checking for $ac_word" >&5
+echo "$as_me:42746: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42726,7 +42758,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:42729: found $ac_dir/$ac_word" >&5
+echo "$as_me:42761: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42734,10 +42766,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:42737: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:42769: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42740: result: no" >&5
+  echo "$as_me:42772: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42776,7 +42808,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42779: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42811: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42861,7 +42893,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:42864: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42896: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -42871,7 +42903,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:42874: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42906: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -42881,7 +42913,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:42884: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42916: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -42890,11 +42922,11 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42893 "configure"
+#line 42925 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello world");
   ;
@@ -42902,16 +42934,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42908: \$? = $ac_status" >&5
+  echo "$as_me:42940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42914: \$? = $ac_status" >&5
+  echo "$as_me:42946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42919,12 +42951,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42922: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42954: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:42927: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42959: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42932,7 +42964,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:42935: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:42967: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42940,7 +42972,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42943 "configure"
+#line 42975 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42951,7 +42983,7 @@ extern "C"
    builtin and then its argument prototype would still apply.  */
 char XOpenDisplay ();
 int
-main ()
+main (void)
 {
 XOpenDisplay ();
   ;
@@ -42959,16 +42991,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42965: \$? = $ac_status" >&5
+  echo "$as_me:42997: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42971: \$? = $ac_status" >&5
+  echo "$as_me:43003: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -42979,7 +43011,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42982: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:43014: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
 
@@ -43001,7 +43033,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:43004: checking for XCurses library" >&5
+echo "$as_me:43036: checking for XCurses library" >&5
 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43024,14 +43056,14 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43027 "configure"
+#line 43059 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
 char *XCursesProgramName = "test";
 
 int
-main ()
+main (void)
 {
 XCursesExit();
   ;
@@ -43039,16 +43071,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43045: \$? = $ac_status" >&5
+  echo "$as_me:43077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43051: \$? = $ac_status" >&5
+  echo "$as_me:43083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -43059,7 +43091,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43062: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:43094: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -43074,23 +43106,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:43077: checking for xcurses.h" >&5
+	echo "$as_me:43109: checking for xcurses.h" >&5
 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 43083 "configure"
+#line 43115 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:43087: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43119: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:43093: \$? = $ac_status" >&5
+  echo "$as_me:43125: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43109,7 +43141,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43112: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:43144: result: $ac_cv_header_xcurses_h" >&5
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
 
@@ -43120,7 +43152,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:43123: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:43155: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -43129,7 +43161,7 @@ fi
 	esac
 else
 
-echo "$as_me:43132: checking if we can include termio.h with curses" >&5
+echo "$as_me:43164: checking if we can include termio.h with curses" >&5
 echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6
 if test "${cf_cv_termio_and_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43139,13 +43171,13 @@ else
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat >conftest.$ac_ext <<_ACEOF
-#line 43142 "configure"
+#line 43174 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
 #include <termio.h>
 int
-main ()
+main (void)
 {
 putchar(0x0a)
   ;
@@ -43153,16 +43185,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43156: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43159: \$? = $ac_status" >&5
+  echo "$as_me:43191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43165: \$? = $ac_status" >&5
+  echo "$as_me:43197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -43175,7 +43207,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:43178: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:43210: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -43192,23 +43224,23 @@ if test $cf_cv_screen != slang ; then
 for ac_header in $cf_cv_screen/term.h term.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43195: checking for $ac_header" >&5
+echo "$as_me:43227: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 43201 "configure"
+#line 43233 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43205: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43237: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:43211: \$? = $ac_status" >&5
+  echo "$as_me:43243: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43227,7 +43259,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43230: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43262: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -43239,7 +43271,7 @@ done
 
 	fi
 
-echo "$as_me:43242: checking if curses supports alternate-character set" >&5
+echo "$as_me:43274: checking if curses supports alternate-character set" >&5
 echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6
 if test "${cf_cv_alt_char_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43248,13 +43280,13 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43251 "configure"
+#line 43283 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 
 int
-main ()
+main (void)
 {
 chtype x = $mapname['l']; $mapname['m'] = 0
   ;
@@ -43262,16 +43294,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43268: \$? = $ac_status" >&5
+  echo "$as_me:43300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43274: \$? = $ac_status" >&5
+  echo "$as_me:43306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -43285,27 +43317,27 @@ done
 
 fi
 
-echo "$as_me:43288: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:43320: result: $cf_cv_alt_char_set" >&5
 echo "${ECHO_T}$cf_cv_alt_char_set" >&6
 test $cf_cv_alt_char_set != no &&
 cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:43295: checking if curses supports fancy attributes" >&5
+echo "$as_me:43327: checking if curses supports fancy attributes" >&5
 echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6
 if test "${cf_cv_fancy_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43302 "configure"
+#line 43334 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 
 int
-main ()
+main (void)
 {
 attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 	 wattrset(stdscr, A_BLINK|A_DIM);
@@ -43317,16 +43349,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43323: \$? = $ac_status" >&5
+  echo "$as_me:43355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43329: \$? = $ac_status" >&5
+  echo "$as_me:43361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -43338,14 +43370,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43341: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:43373: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
 test $cf_cv_fancy_curses = yes &&
 cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
-echo "$as_me:43348: checking for function curses_version" >&5
+echo "$as_me:43380: checking for function curses_version" >&5
 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43355,11 +43387,11 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 43358 "configure"
+#line 43390 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
-int main()
+int main(void)
 {
 	char temp[1024];
 	sprintf(temp, "%s\n", curses_version());
@@ -43368,15 +43400,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:43371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43374: \$? = $ac_status" >&5
+  echo "$as_me:43406: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:43376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43379: \$? = $ac_status" >&5
+  echo "$as_me:43411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -43391,7 +43423,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:43394: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:43426: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes &&
 cat >>confdefs.h <<\EOF
@@ -43399,19 +43431,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:43402: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:43434: checking for obsolete/broken version of ncurses" >&5
 echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6
 if test "${cf_cv_ncurses_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43409 "configure"
+#line 43441 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 
 #if defined(NCURSES_VERSION) && defined(wgetbkgd)
@@ -43425,16 +43457,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43431: \$? = $ac_status" >&5
+  echo "$as_me:43463: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43437: \$? = $ac_status" >&5
+  echo "$as_me:43469: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -43446,10 +43478,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43449: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:43481: result: $cf_cv_ncurses_broken" >&5
 echo "${ECHO_T}$cf_cv_ncurses_broken" >&6
 if test "$cf_cv_ncurses_broken" = yes ; then
-	{ echo "$as_me:43452: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:43484: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 
 cat >>confdefs.h <<\EOF
@@ -43459,20 +43491,20 @@ EOF
 fi
 fi
 
-echo "$as_me:43462: checking if curses supports color attributes" >&5
+echo "$as_me:43494: checking if curses supports color attributes" >&5
 echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6
 if test "${cf_cv_color_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43469 "configure"
+#line 43501 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 
 int
-main ()
+main (void)
 {
 chtype x = COLOR_BLUE;
 	 has_colors();
@@ -43486,16 +43518,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43492: \$? = $ac_status" >&5
+  echo "$as_me:43524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43498: \$? = $ac_status" >&5
+  echo "$as_me:43530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -43507,7 +43539,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43510: result: $cf_cv_color_curses" >&5
+echo "$as_me:43542: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -43529,23 +43561,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43532: checking for $ac_header" >&5
+echo "$as_me:43564: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 43538 "configure"
+#line 43570 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43542: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43574: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:43548: \$? = $ac_status" >&5
+  echo "$as_me:43580: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43564,7 +43596,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43567: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43599: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -43579,23 +43611,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43582: checking for $ac_header" >&5
+echo "$as_me:43614: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 43588 "configure"
+#line 43620 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43592: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43624: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:43598: \$? = $ac_status" >&5
+  echo "$as_me:43630: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43614,7 +43646,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43617: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43649: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -43632,14 +43664,14 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:43635: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:43667: checking whether termios.h needs _POSIX_SOURCE" >&5
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43638 "configure"
+#line 43670 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
-main ()
+main (void)
 {
 struct termios foo; int x = foo.c_iflag
   ;
@@ -43647,16 +43679,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43653: \$? = $ac_status" >&5
+  echo "$as_me:43685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43659: \$? = $ac_status" >&5
+  echo "$as_me:43691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -43664,13 +43696,13 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43667 "configure"
+#line 43699 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include <termios.h>
 int
-main ()
+main (void)
 {
 struct termios foo; int x = foo.c_iflag
   ;
@@ -43678,16 +43710,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43684: \$? = $ac_status" >&5
+  echo "$as_me:43716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43690: \$? = $ac_status" >&5
+  echo "$as_me:43722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -43703,12 +43735,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:43706: result: $termios_bad" >&5
+	echo "$as_me:43738: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:43711: checking declaration of size-change" >&5
+echo "$as_me:43743: checking declaration of size-change" >&5
 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43723,7 +43755,7 @@ do
 	CPPFLAGS="$cf_save_CPPFLAGS"
 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43726 "configure"
+#line 43758 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -43745,7 +43777,7 @@ do
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifdef TIOCGSIZE
@@ -43767,16 +43799,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43802: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43773: \$? = $ac_status" >&5
+  echo "$as_me:43805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43779: \$? = $ac_status" >&5
+  echo "$as_me:43811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -43795,7 +43827,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43798: result: $cf_cv_sizechange" >&5
+echo "$as_me:43830: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -43813,18 +43845,18 @@ EOF
 	esac
 fi
 
-echo "$as_me:43816: checking if ttytype is declared in curses library" >&5
+echo "$as_me:43848: checking if ttytype is declared in curses library" >&5
 echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6
 if test "${cf_cv_have_ttytype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43823 "configure"
+#line 43855 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 char *x = &ttytype[1]; *x = 1
   ;
@@ -43832,16 +43864,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43835: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43838: \$? = $ac_status" >&5
+  echo "$as_me:43870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43844: \$? = $ac_status" >&5
+  echo "$as_me:43876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -43853,7 +43885,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43856: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:43888: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -43862,20 +43894,20 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:43865: checking if curses supports wide characters" >&5
+echo "$as_me:43897: checking if curses supports wide characters" >&5
 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6
 if test "${cf_cv_widec_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43872 "configure"
+#line 43904 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 
     wchar_t temp[2];
@@ -43888,16 +43920,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43894: \$? = $ac_status" >&5
+  echo "$as_me:43926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43900: \$? = $ac_status" >&5
+  echo "$as_me:43932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -43908,7 +43940,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43911: result: $cf_cv_widec_curses" >&5
+echo "$as_me:43943: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -43918,20 +43950,20 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:43921: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:43953: checking if we must include wchar.h to declare mbstate_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_widec_mbstate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43928 "configure"
+#line 43960 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 mbstate_t state
   ;
@@ -43939,30 +43971,30 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43945: \$? = $ac_status" >&5
+  echo "$as_me:43977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43951: \$? = $ac_status" >&5
+  echo "$as_me:43983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 43958 "configure"
+#line 43990 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <wchar.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 mbstate_t state
   ;
@@ -43970,16 +44002,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43976: \$? = $ac_status" >&5
+  echo "$as_me:44008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43982: \$? = $ac_status" >&5
+  echo "$as_me:44014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -43991,7 +44023,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:43994: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:44026: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -44014,7 +44046,7 @@ fi
 
 	fi
 
-echo "$as_me:44017: checking definition to turn on extended curses functions" >&5
+echo "$as_me:44049: checking definition to turn on extended curses functions" >&5
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44022,13 +44054,13 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >conftest.$ac_ext <<_ACEOF
-#line 44025 "configure"
+#line 44057 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 
 #if defined(NCURSES_VERSION_PATCH)
@@ -44048,16 +44080,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44083: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44054: \$? = $ac_status" >&5
+  echo "$as_me:44086: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44060: \$? = $ac_status" >&5
+  echo "$as_me:44092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -44067,14 +44099,14 @@ cat conftest.$ac_ext >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 44070 "configure"
+#line 44102 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
-main ()
+main (void)
 {
 
 #ifdef NCURSES_VERSION
@@ -44089,16 +44121,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44095: \$? = $ac_status" >&5
+  echo "$as_me:44127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44101: \$? = $ac_status" >&5
+  echo "$as_me:44133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -44112,7 +44144,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:44115: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:44147: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case $cf_cv_need_xopen_extension in
@@ -44121,7 +44153,7 @@ case $cf_cv_need_xopen_extension in
 	;;
 esac
 
-echo "$as_me:44124: checking for term.h" >&5
+echo "$as_me:44156: checking for term.h" >&5
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44142,13 +44174,13 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44145 "configure"
+#line 44177 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <${cf_header}>
 int
-main ()
+main (void)
 {
 WINDOW *x
   ;
@@ -44156,16 +44188,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44191: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44162: \$? = $ac_status" >&5
+  echo "$as_me:44194: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44168: \$? = $ac_status" >&5
+  echo "$as_me:44200: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -44184,7 +44216,7 @@ case $cf_cv_term_header in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 44187 "configure"
+#line 44219 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44194,7 +44226,7 @@ case $cf_cv_term_header in
 make an error
 #endif
 int
-main ()
+main (void)
 {
 WINDOW *x
   ;
@@ -44202,16 +44234,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44237: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44208: \$? = $ac_status" >&5
+  echo "$as_me:44240: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44214: \$? = $ac_status" >&5
+  echo "$as_me:44246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -44226,7 +44258,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:44229: result: $cf_cv_term_header" >&5
+echo "$as_me:44261: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
@@ -44253,7 +44285,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:44256: checking for unctrl.h" >&5
+echo "$as_me:44288: checking for unctrl.h" >&5
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44274,13 +44306,13 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44277 "configure"
+#line 44309 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <${cf_header}>
 int
-main ()
+main (void)
 {
 WINDOW *x
   ;
@@ -44288,16 +44320,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44294: \$? = $ac_status" >&5
+  echo "$as_me:44326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44300: \$? = $ac_status" >&5
+  echo "$as_me:44332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -44310,12 +44342,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:44313: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:44345: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
-	{ echo "$as_me:44318: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:44350: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -44371,10 +44403,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:44374: checking for ${cf_func}" >&5
+	echo "$as_me:44406: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:44377: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:44409: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44383,7 +44415,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 44386 "configure"
+#line 44418 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -44401,7 +44433,7 @@ char * XCursesProgramName = "test";
 #endif
 
 int
-main ()
+main (void)
 {
 
 #ifndef ${cf_func}
@@ -44416,16 +44448,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44422: \$? = $ac_status" >&5
+  echo "$as_me:44454: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44428: \$? = $ac_status" >&5
+  echo "$as_me:44460: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -44441,7 +44473,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:44444: result: $cf_result" >&5
+	echo "$as_me:44476: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -44457,13 +44489,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:44460: checking for $ac_func" >&5
+echo "$as_me:44492: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 44466 "configure"
+#line 44498 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -44478,7 +44510,7 @@ char $ac_func ();
 char (*f) ();
 
 int
-main ()
+main (void)
 {
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
@@ -44494,16 +44526,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44500: \$? = $ac_status" >&5
+  echo "$as_me:44532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44506: \$? = $ac_status" >&5
+  echo "$as_me:44538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -44513,7 +44545,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:44516: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:44548: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -44527,12 +44559,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:44530: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:44562: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test $cf_cv_screen = slang ; then
-		{ { echo "$as_me:44535: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:44567: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -44540,7 +44572,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:44543: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:44575: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -44554,7 +44586,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:44557: checking for an rpath option" >&5
+echo "$as_me:44589: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
@@ -44585,12 +44617,12 @@ case $cf_cv_system_name in
 (*)
 	;;
 esac
-echo "$as_me:44588: result: $LD_RPATH_OPT" >&5
+echo "$as_me:44620: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
-	echo "$as_me:44593: checking if we need a space after rpath option" >&5
+	echo "$as_me:44625: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
 
@@ -44611,11 +44643,11 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44614 "configure"
+#line 44646 "configure"
 #include "confdefs.h"
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -44623,16 +44655,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44629: \$? = $ac_status" >&5
+  echo "$as_me:44661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44635: \$? = $ac_status" >&5
+  echo "$as_me:44667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -44642,13 +44674,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:44645: result: $cf_rpath_space" >&5
+	echo "$as_me:44677: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:44651: checking if rpath-hack should be disabled" >&5
+echo "$as_me:44683: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -44665,21 +44697,21 @@ else
 	cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:44668: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:44700: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:44672: checking for updated LDFLAGS" >&5
+echo "$as_me:44704: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:44675: result: maybe" >&5
+	echo "$as_me:44707: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:44682: checking for $ac_word" >&5
+echo "$as_me:44714: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44694,7 +44726,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:44697: found $ac_dir/$ac_word" >&5
+echo "$as_me:44729: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -44702,10 +44734,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:44705: result: $cf_ldd_prog" >&5
+  echo "$as_me:44737: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:44708: result: no" >&5
+  echo "$as_me:44740: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44719,11 +44751,11 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 44722 "configure"
+#line 44754 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("Hello");
   ;
@@ -44731,16 +44763,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44737: \$? = $ac_status" >&5
+  echo "$as_me:44769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44743: \$? = $ac_status" >&5
+  echo "$as_me:44775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -44768,7 +44800,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:44771: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:44803: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -44780,11 +44812,11 @@ echo "${as_me:-configure}:44771: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44783: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44815: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44787: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44819: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -44821,7 +44853,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44824: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44856: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44834,11 +44866,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44837: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44869: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44841: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44873: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -44875,7 +44907,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44878: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44910: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44888,14 +44920,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44891: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44923: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44895: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44927: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:44898: result: no" >&5
+	echo "$as_me:44930: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44996,7 +45028,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:44999: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:45031: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -45128,7 +45160,7 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20150926,
+configured by $0, generated by GNU Autoconf 2.52.20170501,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -45172,7 +45204,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:45175: error: ambiguous option: $1
+    { { echo "$as_me:45207: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -45191,7 +45223,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:45194: error: unrecognized option: $1
+  -*) { { echo "$as_me:45226: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -45210,7 +45242,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20150926, executed with
+This file was extended by $as_me 2.52.20170501, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -45244,7 +45276,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
-  *) { { echo "$as_me:45247: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:45279: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -45596,7 +45628,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:45599: creating $ac_file" >&5
+    { echo "$as_me:45631: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -45614,7 +45646,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:45617: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:45649: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -45627,7 +45659,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:45630: error: cannot find input file: $f" >&5
+           { { echo "$as_me:45662: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45643,7 +45675,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:45646: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:45678: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -45652,7 +45684,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:45655: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:45687: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -45689,7 +45721,7 @@ s, at INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:45692: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:45724: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -45700,7 +45732,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:45703: WARNING: Some variables may not be substituted:
+      { echo "$as_me:45735: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -45749,7 +45781,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:45752: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:45784: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -45760,7 +45792,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:45763: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:45795: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -45773,7 +45805,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:45776: error: cannot find input file: $f" >&5
+           { { echo "$as_me:45808: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45891,7 +45923,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:45894: $ac_file is unchanged" >&5
+      { echo "$as_me:45926: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 6f87323..7dbe962 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.287 2017/04/29 14:49:46 tom Exp $
+dnl $LynxId: configure.in,v 1.290 2017/07/02 18:18:00 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.13)
+AC_REVISION(2.8.9dev.15)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.13
+VERSION=2.8.9dev.15
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
@@ -93,7 +93,7 @@ case $host_os in
 esac
 
 CF_PROG_CC
-AC_PROG_CPP
+CF_PROG_CPP_COMMENTS
 AC_PROG_LN_S
 case $host_os in
 (mingw*)
diff --git a/lynx.cfg b/lynx.cfg
index e289787..5ac2042 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,16 +1,17 @@
-# $LynxId: lynx.cfg,v 1.280 2017/04/29 12:47:15 tom Exp $
+# $LynxId: lynx.cfg,v 1.285 2017/07/04 22:57:01 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9dev.13"
+#PRCS LYNX_VERSION "2.8.9dev.15"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
+#PRCS LYNX_DATE "Thu, 11 May 2017 17:22:30 -0400"
 #
-# Definition pairs are of the form  VARIABLE:DEFINITION
-# NO spaces are allowed between the pair items.
+# Definition pairs (configuration settings) are of the form
+#	VARIABLE:DEFINITION
+# NO spaces are allowed around the colon ":" between the pair items.
 #
 #  If you do not have write access to /usr/local/lib you may change
 #  the default location of this file in the userdefs.h file and recompile,
@@ -21,6 +22,17 @@
 # (Any line beginning with punctuation is ignored).  Leading blanks on each
 # line are ignored; trailing blanks may be significant depending on the option.
 
+# In most cases, a definition can be overridden by another later in the
+# file, or in an including configuration file.  You can see the effect of
+# definitions (and redefinitions) in the trace file Lynx.log by using the
+# "-trace" and "-trace-mask" options, e.g.,
+#	lynx -trace -trace-mask=8
+
+# As a documentation aid, the default values for each setting are shown
+# commented-out.  By convention, these default value comments have no space
+# after the "#", e.g.,
+#	#HTTP_PROTOCOL:1.0
+
 # An HTML'ized description of all settings (based on comments in this file,
 # with alphabetical table of settings and with table of settings by category)
 # is available at http://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html
@@ -958,7 +970,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
 # Local execution links and scripts are by default completely disabled,
 # unless a change is made to the userdefs.h file to enable them or
 # the configure script is used with the corresponding options
-# (--enable-exec-links and --enable-exec-scripts).
+# (-enable-exec-links and -enable-exec-scripts).
 # See the Lynx source code distribution and the userdefs.h
 # file for more detail on enabling execution links and scripts.
 #
@@ -1235,7 +1247,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
 .h2 BIBP_BIBHOST
 # BIBP_BIBHOST is the URL at which local bibp service may be found, if
 # it exists.   Defaults to http://bibhost/ for protocol conformance, but
-# may be overridden here or via --bibhost parameter.
+# may be overridden here or via -bibhost parameter.
 #BIBP_BIBHOST:http://bibhost/
 
 .h1 Interaction
@@ -1291,6 +1303,12 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
 #
 #COLLAPSE_BR_TAGS:TRUE
 
+.h2 TRIM_BLANK_LINES
+# If TRIM_BLANK_LINES is set FALSE, Lynx will not trim trailing blank lines
+# from the document.  Also, Lynx will not collapse BR-tags onto the previous
+# line when it happens to be empty.
+#TRIM_BLANK_LINES:TRUE
+
 .h2 TAGSOUP
 # If TAGSOUP is set, Lynx uses the "Tag Soup DTD" rather than "SortaSGML".
 # The two approaches differ by the style of error detection and recovery.
@@ -2954,7 +2972,7 @@ MINIMAL_COMMENTS:TRUE
 #   gray          brightred      brightgreen   yellow
 #   brightblue    brightmagenta  brightcyan    white
 .fi
-# or (if you have configured using --enable-default-colors with ncurses or
+# or (if you have configured using -enable-default-colors with ncurses or
 # slang), "default" may be used for foreground and background.
 #
 # Note that in most cases a white background is really "lightgray", since
@@ -3266,7 +3284,7 @@ COLOR:6:brightred:black
 # link that otherwise will have no label associated with it).  Using an empty
 # string as the value will cause lynx to behave in the old way - hidden links
 # will be handled according to other settings (mostly the parameter of
-# --hiddenlinks command-line switch).  If the value is non-empty string, hidden
+# -hiddenlinks command-line switch).  If the value is non-empty string, hidden
 # link becomes non-hidden so it won't be handled as hidden link, e.g., listed
 # among hidden links on 'l'isting page.
 #
@@ -3372,6 +3390,7 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:BOOKMARK_FILE:ON
 #ENABLE_LYNXRC:CASE_SENSITIVE_SEARCHING:ON
 #ENABLE_LYNXRC:CHARACTER_SET:ON
+#ENABLE_LYNXRC:COLLAPSE_BR_TAGS:ON
 #ENABLE_LYNXRC:COOKIE_ACCEPT_DOMAINS:ON
 #ENABLE_LYNXRC:COOKIE_FILE:ON
 #ENABLE_LYNXRC:COOKIE_LOOSE_INVALID_DOMAINS:ON
diff --git a/lynx.hlp b/lynx.hlp
index 33415c7..f09b7e6 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -168,6 +168,9 @@
                  in the lynx.cfg or .lynxrc files.  Lynx  tries  the  cfg-file
                  setting first.
 
+       -collapse_br_tags
+              toggles collapsing of BR tags.
+
        -color forces  color  mode  on,  if  available.   Default color control
               sequences which work for many terminal types are assumed if  the
               terminal  capability  description does not specify how to handle
@@ -783,6 +786,10 @@
 
               See CRAWL.announce for more information.
 
+       -trim_blank_lines
+              toggles trimming of trailing blank lines as well as the  related
+              trimming of blank lines while collapsing BR tags.
+
        -trim_input_fields
               trim input text/textarea fields in forms.
 
@@ -793,29 +800,29 @@
               toggles use of _underline_ format in dumps.
 
        -unique_urls
-              check for duplicate link numbers in each page and  corresponding
+              check  for duplicate link numbers in each page and corresponding
               lists, and reuse the original link number.
 
        -use_mouse
-              turn  on  mouse  support, if available.  Clicking the left mouse
-              button on a link traverses it.  Clicking the right mouse  button
-              pops  back.   Click  on the top line to scroll up.  Click on the
-              bottom line to scroll down.  The first few positions in the  top
-              and  bottom  line may invoke additional functions.  Lynx must be
-              compiled with ncurses or slang  to  support  this  feature.   If
-              ncurses  is  used,  clicking  the  middle mouse button pops up a
-              simple menu.  Mouse clicks may only work reliably while Lynx  is
+              turn on mouse support, if available.  Clicking  the  left  mouse
+              button  on a link traverses it.  Clicking the right mouse button
+              pops back.  Click on the top line to scroll up.   Click  on  the
+              bottom  line to scroll down.  The first few positions in the top
+              and bottom line may invoke additional functions.  Lynx  must  be
+              compiled  with  ncurses  or  slang  to support this feature.  If
+              ncurses is used, clicking the middle  mouse  button  pops  up  a
+              simple  menu.  Mouse clicks may only work reliably while Lynx is
               idle waiting for input.
 
        -useragent=Name
               set alternate Lynx User-Agent header.
 
        -validate
-              accept  only  http  URLs  (for  validation).   Complete security
+              accept only  http  URLs  (for  validation).   Complete  security
               restrictions also are implemented.
 
        -verbose
-              toggle [LINK], [IMAGE] and [INLINE] comments with  filenames  of
+              toggle  [LINK],  [IMAGE] and [INLINE] comments with filenames of
               these images.
 
        -version
@@ -825,17 +832,17 @@
               enable vi-like key movement.
 
        -wdebug
-              enable  Waterloo  tcp/ip packet debug (print to watt debugfile).
-              This applies only  to  DOS  versions  compiled  with  WATTCP  or
+              enable Waterloo tcp/ip packet debug (print to  watt  debugfile).
+              This  applies  only  to  DOS  versions  compiled  with WATTCP or
               WATT-32.
 
        -width=NUMBER
-              number  of columns for formatting of dumps, default is 80.  This
-              is limited by the number of columns  that  Lynx  could  display,
+              number of columns for formatting of dumps, default is 80.   This
+              is  limited  by  the  number of columns that Lynx could display,
               typically 1024 (the MAX_LINE symbol).
 
        -with_backspaces
-              emit  backspaces  in output if -dump'ing or -crawl'ing (like man
+              emit backspaces in output if -dump'ing or -crawl'ing  (like  man
               does)
 
        -xhtml_parsing
@@ -843,7 +850,7 @@
               in an XHTML 1.0 document.  For example "<p/>" will be discarded.
 
 2 Commands
-       More  than  one key can be mapped to a given command.  Here are some of
+       More than one key can be mapped to a given command.  Here are  some  of
        the most useful:
 
        *   Use Up arrow and Down arrow to scroll through hypertext links.
@@ -855,104 +862,125 @@
        *   Type "H", "?", or F1 for online help and descriptions of key-stroke
            commands.
 
-       *   Type  "k"  or  "K"  for  a  list  of the current key-stroke command
+       *   Type "k" or "K" for  a  list  of  the  current  key-stroke  command
            mappings.
 
-           If the same command is mapped to the same letter differing only  by
+           If  the same command is mapped to the same letter differing only by
            upper/lowercase only the lowercase mapping is shown.
 
        *   Type Delete to view history list.
 
 2 Environment
-       In  addition  to various "standard" environment variables such as HOME,
-       PATH, USER, DISPLAY, TMPDIR, etc, Lynx utilizes  several  Lynx-specific
+       In addition to various "standard" environment variables such  as  HOME,
+       PATH,  USER,  DISPLAY, TMPDIR, etc, Lynx utilizes several Lynx-specific
        environment variables, if they exist.
 
-       Others  may  be created or modified by Lynx to pass data to an external
+       Others may be created or modified by Lynx to pass data to  an  external
        program, or for other reasons.  These are listed separately below.
 
-       See also the sections on SIMULATED  CGI  SUPPORT  and  NATIVE  LANGUAGE
+       See  also  the  sections  on  SIMULATED CGI SUPPORT and NATIVE LANGUAGE
        SUPPORT, below.
 
-       Note:   Not  all  environment variables apply to all types of platforms
-       supported by Lynx, though most do.  Feedback on  platform  dependencies
+       Note:  Not all environment variables apply to all  types  of  platforms
+       supported  by  Lynx, though most do.  Feedback on platform dependencies
        is solicited.
 
        Environment Variables Used By Lynx:
 
        COLORTERM           If set, color capability for the terminal is forced
-                           on at startup time.  The actual value  assigned  to
-                           the  variable  is  ignored.   This variable is only
+                           on  at  startup time.  The actual value assigned to
+                           the variable is ignored.   This  variable  is  only
                            meaningful  if  Lynx  was  built  using  the  slang
                            screen-handling library.
 
-       LYNX_CFG            This  variable,  if  set, will override the default
-                           location and name of the global configuration  file
-                           (normally,   lynx.cfg)  that  was  defined  by  the
+       LYNX_CFG            This variable, if set, will  override  the  default
+                           location  and name of the global configuration file
+                           (normally,  lynx.cfg)  that  was  defined  by   the
                            LYNX_CFG_FILE  constant  in  the  userdefs.h  file,
                            during installation.
 
                            See the userdefs.h file for more information.
 
-       LYNX_CFG_PATH       If  set,  this  variable  overrides the compiled-in
-                           search-list  of  directories  used  to   find   the
-                           configuration  files,  e.g., lynx.cfg and lynx.lss.
+       LYNX_CFG_PATH       If set, this  variable  overrides  the  compiled-in
+                           search-list   of   directories  used  to  find  the
+                           configuration files, e.g., lynx.cfg  and  lynx.lss.
                            The list is delimited with ":" (or ";" for Windows)
                            like the PATH environment variable.
 
        LYNX_HELPFILE       If set, this variable overrides the compiled-in URL
                            and configuration file URL for the Lynx help file.
 
-       LYNX_LOCALEDIR      If set, this  variable  overrides  the  compiled-in
-                           location  of  the  locale  directory which contains
+       LYNX_LOCALEDIR      If  set,  this  variable  overrides the compiled-in
+                           location of the  locale  directory  which  contains
                            native language (NLS) message text.
 
-       LYNX_LSS            This variable, if set, specifies  the  location  of
-                           the   default  Lynx  character  style  sheet  file.
-                           [Currently only meaningful if Lynx was built  using
+       LYNX_LSS            This  variable,  if  set, specifies the location of
+                           the  default  Lynx  character  style  sheet   file.
+                           [Currently  only meaningful if Lynx was built using
                            curses color style support.]
 
-       LYNX_SAVE_SPACE     This  variable,  if  set, will override the default
+       LYNX_SAVE_SPACE     This variable, if set, will  override  the  default
                            path prefix for files saved to disk that is defined
                            in the lynx.cfg SAVE_SPACE: statement.
 
                            See the lynx.cfg file for more information.
 
-       LYNX_TEMP_SPACE     This  variable,  if  set, will override the default
-                           path prefix for temporary files  that  was  defined
-                           during  installation, as well as any value that may
+       LYNX_TEMP_SPACE     This variable, if set, will  override  the  default
+                           path  prefix  for  temporary files that was defined
+                           during installation, as well as any value that  may
                            be assigned to the TMPDIR variable.
 
        MAIL                This variable specifies the default inbox Lynx will
-                           check  for new mail, if such checking is enabled in
+                           check for new mail, if such checking is enabled  in
                            the lynx.cfg file.
 
-       NEWS_ORGANIZATION   This variable, if set, provides the string used  in
-                           the  Organization:  header of USENET news postings.
-                           It will override the setting  of  the  ORGANIZATION
-                           environment  variable,  if  it is also set (and, on
+       NEWS_ORGANIZATION   This  variable, if set, provides the string used in
+                           the Organization: header of USENET  news  postings.
+                           It  will  override  the setting of the ORGANIZATION
+                           environment variable, if it is also  set  (and,  on
                            UNIX, the contents of an /etc/organization file, if
                            present).
 
-       NNTPSERVER          If  set,  this  variable specifies the default NNTP
-                           server that will be used for  USENET  news  reading
+       NNTPSERVER          If set, this variable specifies  the  default  NNTP
+                           server  that  will  be used for USENET news reading
                            and posting with Lynx, via news: URL's.
 
-       ORGANIZATION        This  variable, if set, provides the string used in
-                           the Organization: header of USENET  news  postings.
-                           On  UNIX,  it  will  override  the  contents  of an
+       ORGANIZATION        This variable, if set, provides the string used  in
+                           the  Organization:  header of USENET news postings.
+                           On UNIX,  it  will  override  the  contents  of  an
                            /etc/organization file, if present.
 
        PROTOCOL_proxy      Lynx supports the use of proxy servers that can act
                            as firewall gateways and caching servers.  They are
-                           preferable  to  the  older  gateway  servers   (see
+                           preferable   to  the  older  gateway  servers  (see
                            WWW_access_GATEWAY, below).
 
-                           Each  protocol  used  by  Lynx, (http, ftp, gopher,
-                           etc),  can  be   mapped   separately   by   setting
-                           environment  variables  of  the form PROTOCOL_proxy
-                           (literally:  http_proxy,  ftp_proxy,  gopher_proxy,
-                           etc), to "http://some.server.dom:port/".
+                           Each protocol used by  Lynx,  (http,  ftp,  gopher,
+                           etc),   can   be   mapped   separately  by  setting
+                           environment variables of the  form  PROTOCOL_proxy.
+                           Protocols are indicated in a URI by the name before
+                           ":", e.g., "http" in "http://some.server.dom:port/"
+                           for HTML.
+
+                           Depending   on   your   system   configuration  and
+                           supported  protocols,  the  environment   variables
+                           recognized by lynx may include
+
+                             cso_proxy
+                             finger_proxy
+                             ftp_proxy
+                             gopher_proxy
+                             https_proxy
+                             http_proxy
+                             newspost_proxy
+                             newsreply_proxy
+                             news_proxy
+                             nntp_proxy
+                             no_proxy
+                             snewspost_proxy
+                             snewsreply_proxy
+                             snews_proxy
+                             wais_proxy
 
                            See  Lynx  Users  Guide  for additional details and
                            examples.
diff --git a/lynx.man b/lynx.man
index d5feb3d..d44a630 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,4 +1,4 @@
-.\" $LynxId: lynx.man,v 1.117 2017/04/28 01:19:42 tom Exp $
+.\" $LynxId: lynx.man,v 1.119 2017/07/04 20:45:52 tom Exp $
 .\" **************************************************************************
 .\" Escape single quotes in literal strings from groff's Unicode transform.
 .ie \n(.g .ds AQ \(aq
@@ -231,6 +231,9 @@ lynx.cfg or \&.lynxrc files.
 \fILynx\fP tries the cfg-file setting first.
 .RE
 .TP
+.B \-collapse_br_tags
+toggles collapsing of BR tags.
+.TP
 .B \-color
 forces color mode on, if available.
 Default color control sequences
@@ -900,6 +903,10 @@ is output to a file, intended for indexing.
 .IP
 See CRAWL.announce for more information.
 .TP
+.B \-trim_blank_lines
+toggles trimming of trailing blank lines as well as
+the related trimming of blank lines while collapsing BR tags.
+.TP
 .B \-trim_input_fields
 trim input text/textarea fields in forms.
 .TP
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index c6cb8cb..ec16953 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: Lynx_users_guide.html,v 1.130 2017/04/28 16:42:13 tom Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.131 2017/07/04 20:41:58 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -688,7 +688,7 @@
   generated at runtime, in which the user fills in choices as in
   any ordinary HTML form.</p>
   <pre>
-                    Options Menu (Lynx Version 2.8.8pre.2)
+                    Options Menu (Lynx Version 2.8.9dev.15)
 
     Accept Changes - Reset Changes - Left Arrow cancels changes - HELP!
 
@@ -731,6 +731,8 @@
   Bad HTML messages (!)            : [Warn, point to trace-file]
   Show images                      : [ignore___]
   Verbose images                   : [OFF__________]
+  Collapse BR tags (!)             : [OFF_____]
+  Trim blank lines (!)             : [trim-lines]
 
   Headers Transferred to Remote Servers
   Personal mail address            : __________________________________________
@@ -772,7 +774,7 @@
   accessed by setting FORMS_OPTIONS to TRUE in <a href=
   "#lynx.cfg">lynx.cfg</a>.</p>
   <pre>
-             Options Menu (Lynx Version 2.8.8pre.2)
+             Options Menu (Lynx Version 2.8.9dev.15)
 
      (E)ditor                     : emacs
      (D)ISPLAY variable           : aixtest.cc.ukans.edu:0.0
@@ -908,6 +910,15 @@
       [.BM]lynx_bookmarks.html).</p>
     </dd>
 
+    <dt>Collapse BR tags</dt>
+
+    <dd>If <em>Collapse BR tags</em> is turned off, Lynx will not
+    collapse serial <code>BR</code> tags. If turned on, i.e.,
+    “collapse”, two or more concurrent <code>BR</code>s
+    will be collapsed into a single line break. Note that the valid
+    way to insert extra blank lines in HTML is via a
+    <code>PRE</code> block with only newlines in the block.</dd>
+
     <dt>Cookies</dt>
 
     <dd>This option allows you to tell how to handle cookies:
@@ -1366,6 +1377,14 @@
     prompt, <em>force no-response</em> to reply "no" to each
     prompt.</dd>
 
+    <dt>Trim blank lines</dt>
+
+    <dd>If <em>Trim blank lines</em> is turned off, Lynx will not
+    trim trailing blank lines from the document. Also, Lynx will
+    not collapse <code>BR</code>-tags onto the previous line when
+    it happens to be empty as part of the <em>Collapse BR tags</em>
+    feature.</dd>
+
     <dt>Type of Search</dt>
 
     <dd>Searching type has two possible values: CASE INSENSITIVE
diff --git a/makefile.in b/makefile.in
index 705cb53..7bd87c1 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.160 2017/04/29 12:47:15 tom Exp $
+# $LynxId: makefile.in,v 1.162 2017/05/11 21:22:30 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9dev.13
+LYNX_VERSION	= 2.8.9dev.15
 
 ## 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.
diff --git a/po/eo.po b/po/eo.po
index 0f9711d..9a3fa52 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,16 +1,17 @@
 # Esperanto translation of Lynx.
 # This file is distributed under the same license as the lynx package.
 # Translators:
-# Keith Bowes <zooplah at gmail.com>, 2011.
+# Keith Bowes <zooplah at gmail.com>, 2011, 2014, 2015, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.8-dev9\n"
+"Project-Id-Version: lynx 2.8.9-dev7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-12 19:13-0500\n"
-"PO-Revision-Date: 2014-02-08 15:11-0500\n"
+"POT-Creation-Date: 2015-12-14 20:39-0500\n"
+"PO-Revision-Date: 2017-05-11 23:34-0400\n"
 "Last-Translator: Keith Bowes <zooplah at gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
 "Language: eo\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,2021 +31,2088 @@ msgstr ""
 #. * translations.  When no translation is available, the English default is
 #. * used.
 #.
-#: LYMessages.c:27
+#: LYMessages.c:28
 #, c-format
 msgid "Alert!: %s"
 msgstr "Averto!: %s"
 
-#: LYMessages.c:28
+#: LYMessages.c:29
 msgid "Welcome"
 msgstr "Bonvenon"
 
-#: LYMessages.c:29
+#: LYMessages.c:30
 msgid "Are you sure you want to quit?"
 msgstr "Ĉu vi certas, ke vi volas eliri?"
 
-#: LYMessages.c:31
+#: LYMessages.c:32
 msgid "Really exit from Lynx?"
-msgstr "Ĉu efektive eliri el Linko?"
+msgstr "Ĉu efektive eliri el Lynx?"
 
-#: LYMessages.c:33
+#: LYMessages.c:34
 msgid "Connection interrupted."
 msgstr "Konekto interrompita."
 
-#: LYMessages.c:34
+#: LYMessages.c:35
 msgid "Data transfer interrupted."
 msgstr "Datumo-transigo interrompita."
 
-#: LYMessages.c:35
+#: LYMessages.c:36
 msgid "Cancelled!!!"
 msgstr "Nuligita!"
 
-#: LYMessages.c:36
+#: LYMessages.c:37
 msgid "Cancelling!"
 msgstr "Nuliganta!"
 
-#: LYMessages.c:37
+#: LYMessages.c:38
 msgid "Excellent!!!"
 msgstr "Bonege!"
 
-#: LYMessages.c:38
+#: LYMessages.c:39
 msgid "OK"
 msgstr "Bone"
 
-#: LYMessages.c:39
+#: LYMessages.c:40
 msgid "Done!"
 msgstr "Finita!"
 
-#: LYMessages.c:40
+#: LYMessages.c:41
 msgid "Bad request!"
 msgstr "Fuŝan peton!"
 
-#: LYMessages.c:41
+#: LYMessages.c:42
 msgid "previous"
 msgstr "antaŭa"
 
-#: LYMessages.c:42
+#: LYMessages.c:43
 msgid "next screen"
 msgstr "sekva ekranpleno"
 
-# ??u komando al komputilo a?? ??u al uzanto?
-#: LYMessages.c:43
+# Ĉu komando al komputilo aŭ al uzanto?
+#: LYMessages.c:44
 msgid "HELP!"
 msgstr "Helpu min!"
 
-#: LYMessages.c:44
+#: LYMessages.c:45
 msgid ", help on "
 msgstr ", helpo pri "
 
 #. #define HELP
-#: LYMessages.c:46
+#: LYMessages.c:47
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Komandoj: Uzu la sagoklavojn por movi, '?' por helpo, 'q' por eliri, '<-' por retroiri."
 
 #. #define MOREHELP
-#: LYMessages.c:48
+#: LYMessages.c:49
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- premu spacetklavon por la sekva ekranpleno, uzu sagoklavojn por movi, '?' por helpo, 'q' por eliri."
 
-#: LYMessages.c:49
+#: LYMessages.c:50
 msgid "-- press space for next page --"
 msgstr "-- premu spacetklavon por la sekva ekranpleno --"
 
-#: LYMessages.c:50
+#: LYMessages.c:51
 msgid "URL too long"
-msgstr "Retadreso tro longas"
+msgstr "URL tro longas"
 
 #. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_ADV_MSG_INA
+#: LYMessages.c:57
+#, c-format
+msgid "(Textfield \"%s\"); Inactive.  Press <return> to activate."
+msgstr "(Teksta kampo \"%s\") Neaktiva. Premu enen-klavon por aktivigi."
+
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:56
+#: LYMessages.c:59
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Teksta kampo) Neaktiva. Premu enen-klavon por aktivigi."
 
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_INA
+#: LYMessages.c:61
+#, c-format
+msgid "(Textarea \"%s\"); Inactive.  Press <return> to activate."
+msgstr "(Tekstregiono \"%s\") Neaktiva. Premu enen-klavon por aktivigi."
+
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:58
+#: LYMessages.c:63
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Tekstregiono) Neaktiva. Premu enen-klavon por aktivigi."
 
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_INA_E
+#: LYMessages.c:65
+#, c-format
+msgid "(Textarea \"%s\"); Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(Tekstregiono \"%s\") Neaktiva. Premu enen-klavon por aktivigi (%s por tekstoredaktilo)."
+
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:60
+#: LYMessages.c:67
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Tekstregiono) Neaktiva. Premu enen-klavon por aktivigi (%s por tekstoredaktilo)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:69
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Formulara kampo) Neaktiva. Uzu enen-klavon por redakti."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:64
+#: LYMessages.c:71
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Formulara kampo) Neaktiva. Uzu enen-klavon por redakti (%s por sendi ignorante la tenejon)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:73
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Formulara kampo) Neaktiva. Premu enen-klavon por redakti. Premu enen-klavon dufoje por sendi."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:68
+#: LYMessages.c:75
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(retpoŝta kampo) Neaktiva. Premu enen-klavon por ŝanĝi."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:77
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Pasvorta kampo) Neaktiva. Premu enen-klavon por aktivigi."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:73
+#: LYMessages.c:80
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
-msgstr "NEŜANĜEBLA kampo. Uzu la supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi."
+msgstr "NEŜANĜEBLA kampo. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:75
+#: LYMessages.c:82
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Dosiera kampo) Enmetu dosiernomon. Uzu la supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi."
+msgstr "(Dosiera kampo) Enmetu dosiernomon. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
 
+#. #define FORM_LINK_TEXT_ADV_MSG
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:77
-msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Teksta kampo) Enmetu tekston. Uzu la supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi."
+#: LYMessages.c:84 LYMessages.c:86
+#, c-format
+msgid "(Textfield \"%s\"); Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Teksta kampo \"%s\") Enmetu tekston. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
+
+#. #define FORM_LINK_TEXTAREA_ADV_MSG
+#: LYMessages.c:88
+#, c-format
+msgid "(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(Tekstregiono \"%s\") Enmetu tekston. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:90
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
-msgstr "(Tekstregiono) Enmetu tekston. Uzu la supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi."
+msgstr "(Tekstregiono) Enmetu tekston. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
+
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_E
+#: LYMessages.c:92
+#, c-format
+msgid "(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(Tekstregiono \"%s\") Enmetu tekston. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi (%s por tekstoredaktilo)."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:81
+#: LYMessages.c:94
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(Tekstregiono) Enmetu tekston. Uzu la supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi (%s por tekstoredaktilo)."
+msgstr "(Tekstregiono) Enmetu tekston. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi (%s por tekstoredaktilo)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:83
+#: LYMessages.c:96
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
-msgstr "NEŜANĜEBLA teksta kampo. Uzu la supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi (%s por tekstoredaktilo)."
+msgstr "NEŜANĜEBLA teksta kampo. Uzu la supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi (%s por tekstoredaktilo)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:85
+#: LYMessages.c:98
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Teksta kampo) Enmetu tekston. Uzu enen-klavon por sendi."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:87
+#: LYMessages.c:100
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Formulara kampo) Enmetu tekston. Uzu enen-klavon por sendi (%s por neniu tenejo)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:102
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Formulara kampo) Enmetu tekston. Uzu enen-klavon por sendi, sagoklavojn aŭ tabon por movi de ĝi."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:91
+#: LYMessages.c:104
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
-msgstr "NEŜANĜEBLA formulara kampo. Uzu supran aŭ suban sagoklavojn por movi de ĝi."
+msgstr "NEŜANĜEBLA formulara kampo. Uzu supran aŭ malsupran sagoklavojn por movi de ĝi."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:93
+#: LYMessages.c:106
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(retpoŝta kampo) Enmetu tekston. Uzu enen-klavon por sendi, sagoklavojn por movi de ĝi."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:95
+#: LYMessages.c:108
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(retpoŝta kampo) Retpoŝto estas malaktiva. Vi ne rajtas sendi tion."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:97
+#: LYMessages.c:110
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Pasvorta kampo) Enmetu tekston. Uzu supran aŭ suban sagoklavojn por movi de ĝi."
+msgstr "(Pasvorta kampo) Enmetu tekston. Uzu supran aŭ malsupran sagoklavojn por movi de ĝi."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:99
+#: LYMessages.c:112
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
-msgstr "NEŜANĜEBLA pasvorto. Uzu supran aŭ suban sagoklavojn por movi de ĝi."
+msgstr "NEŜANĜEBLA pasvorto. Uzu supran aŭ malsupran sagoklavojn por movi de ĝi."
+
+#. #define FORM_LINK_CHECKBOX_ADV_MSG
+#: LYMessages.c:114
+#, c-format
+msgid "(Checkbox \"%s\");   Use right-arrow or <return> to toggle."
+msgstr "(Markobutono \"%s\") Uzu la dekstran sagoklavon aŭ enen-klavon por inversigi."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:116
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Markobutono) Uzu la dekstran sagoklavon aŭ enen-klavon por inversigi."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:118
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
-msgstr "NEŜANĜEBLA markobutono. Uzu supran aŭ suban sagoklavojn por movi de ĝi."
+msgstr "NEŜANĜEBLA markobutono. Uzu supran aŭ malsupran sagoklavojn por movi de ĝi."
+
+#. #define FORM_LINK_RADIO_ADV_MSG
+#: LYMessages.c:120
+#, c-format
+msgid "(Radio Button \"%s\");   Use right-arrow or <return> to toggle."
+msgstr "(Radiobutono \"%s\") Uzu la dekstran sagoklavon aŭ la enen-klavon por inversigi."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:122
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Radiobutono) Uzu la dekstran sagoklavon aŭ la enen-klavon por inversigi."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:124
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
-msgstr "NEŜANĜEBLA radiobutono. Uzu supran aŭ suban sagoklavojn por movi de ĝi."
+msgstr "NEŜANĜEBLA radiobutono. Uzu supran aŭ malsupran sagoklavojn por movi de ĝi."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:109
+#: LYMessages.c:126
 msgid "Submit ('x' for no cache) to "
 msgstr "Sendi ('x' por neniu konservado) al "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:111
+#: LYMessages.c:128
 msgid "Submit to "
 msgstr "Sendi al "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:113
+#: LYMessages.c:130
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Sendobutono) Uzu la dekstran sagoklavon aŭ enen-klavon por sendi ('x' por neniu tenejo)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:115
+#: LYMessages.c:132
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Sendobutono) Uzu la dekstran sagoklavon aŭ enen-klavon por sendi."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:117
+#: LYMessages.c:134
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
-msgstr "MALAKTIVA sendobutono. Uzu supran aŭ suban sagoklavojn por movi de ĝi."
+msgstr "MALAKTIVA sendobutono. Uzu supran aŭ malsupran sagoklavojn por movi de ĝi."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:119
+#: LYMessages.c:136
 msgid "Submit mailto form to "
 msgstr "Sendi retpoŝtan formularon al "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:121
+#: LYMessages.c:138
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(retpoŝta sendobutono) Uzu la dekstran sagoklavon aŭ enen-klavon por sendi."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:123
+#: LYMessages.c:140
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(retpoŝta sendobutono) Retpoŝto estas malaktiva. Vi ne rajtas sendi tion."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:125
+#: LYMessages.c:142
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Restarigobutono) Uzu la dekstran sagoklavon aŭ enen-klavon por restarigi la kampojn."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:144
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
-msgstr "MALAKTIVA restarigobutono. Uzu supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi."
+msgstr "MALAKTIVA restarigobutono. Uzu supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
 
 #. #define FORM_LINK_BUTTON_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:146
 msgid "(Script button)   Use UP or DOWN arrows or tab to move off."
-msgstr "(Skriptobutono) Uzu supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi."
+msgstr "(Skriptobutono) Uzu supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
+
+#. #define FORM_LINK_BUTTON_ADV_MSG
+#: LYMessages.c:148
+#, c-format
+msgid "(Script button \"%s\");   Use UP or DOWN arrows or tab to move off."
+msgstr "(Skriptobutono \"%s\") Uzu supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
 
 #. #define FORM_LINK_BUTTON_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:150
 msgid "DISABLED Script button.  Use UP or DOWN arrows or tab to move off."
-msgstr "MALAKTIVA skriptobutono. Uzu supran aŭ suban sagoklavojn aŭ tabon por movi de ĝi."
+msgstr "MALAKTIVA skriptobutono. Uzu supran aŭ malsupran sagoklavojn aŭ tabon por movi de ĝi."
+
+#. #define FORM_LINK_OPTION_LIST_ADV_MSG
+#: LYMessages.c:152
+#, c-format
+msgid "(Option list \"%s\"); Hit return to select option."
+msgstr "(Elekto-list \"%s\") Premu enen-klavon por elekti."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:154
 msgid "(Option list) Hit return and use arrow keys and return to select option."
-msgstr "(Elektilo) Premu enen-klavon kaj uzu sagoklavojn kaj enen-klavon por elekti."
+msgstr "(Elekto-listo) Premu enen-klavon kaj uzu sagoklavojn kaj enen-klavon por elekti."
+
+#. #define CHOICE_LIST_ADV_MSG
+#: LYMessages.c:156
+#, c-format
+msgid "(Choice entry \"%s\"); Use arrow keys and return to select option."
+msgstr "(Elekto-listero \"%s\") Premu enen-klavon kaj uzu sagoklavojn kaj enen-klavon por elekti."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:158
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
-msgstr "(Elektilo) Premu enen-klavon kaj uzu sagoklavojn kaj enen-klavon por elekti."
+msgstr "(Elekto-listo) Premu enen-klavon kaj uzu sagoklavojn kaj enen-klavon por elekti."
+
+#. #define MOUSE_CHOICE_MESSAGE
+#: LYMessages.c:160
+msgid "Left mouse button or return to select, arrow keys to scroll."
+msgstr "Maldekstra musbutono aŭ enen-klavo por elekti, sagoklavoj por rulumi."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:162
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
-msgstr "NEŜANĜEBLA elektilo. Uzu la enen-klavon aŭ sagoklavoj por kontroli aŭ forlasi."
+msgstr "NEŜANĜEBLA elekto-listo. Uzu la enen-klavon aŭ sagoklavoj por kontroli aŭ forlasi."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:164
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
-msgstr "NEŜANĜEBLA elektilo. Uzu la enen-klavon aŭ sagoklavoj por kontroli aŭ foriri."
+msgstr "NEŜANĜEBLA elekto-listo. Uzu la enen-klavon aŭ sagoklavoj por kontroli aŭ foriri."
 
-#: LYMessages.c:140
+#: LYMessages.c:165
 msgid "Submitting form..."
 msgstr "Sendante formularon..."
 
-#: LYMessages.c:141
+#: LYMessages.c:166
 msgid "Resetting form..."
 msgstr "Restarigante formularon..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:168
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Reŝarganta dokumenton. Ĉiuj kampoj estos forviŝitaj!"
 
 #. #define LINK_NOT_IN_FORM
-#: LYMessages.c:145
+#: LYMessages.c:170
 msgid "The current link is not in a FORM"
-msgstr "La aktuala ligilo ne estas en formularo"
+msgstr "La nuna ligilo ne estas en formularo"
 
-#: LYMessages.c:146
+#: LYMessages.c:171
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Averto: Ne eblas ŝanĝi la kodoprezenton de la formularo al %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:149
+#: LYMessages.c:174
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(Ordinara ligilo) Uzu la dekstran sagoklavon aŭ la enen-klavon por aktivigi."
 
-#: LYMessages.c:150
+#: LYMessages.c:175
 msgid "The resource requested is not available at this time."
-msgstr "La risurco petita ne estas aktuale havebla."
+msgstr "La risurco petita ne estas nune disponebla."
 
-#: LYMessages.c:151
+#: LYMessages.c:176
 msgid "Enter Lynx keystroke command: "
-msgstr "Enmetu Linko-klavan komandon:"
+msgstr "Enmetu Lynx-klavan komandon:"
 
-#: LYMessages.c:152
+#: LYMessages.c:177
 msgid "Looking up "
 msgstr "Serĉanta je "
 
-#: LYMessages.c:153
+#: LYMessages.c:178
 #, c-format
 msgid "Getting %s"
 msgstr "Ricevante je %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:179
 #, c-format
 msgid "Skipping %s"
 msgstr "Preterlasante je %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:180
 #, c-format
 msgid "Using %s"
 msgstr "Uzante je %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:181
 #, c-format
 msgid "Illegal URL: %s"
-msgstr "Nevalida retadreso: %s"
+msgstr "Nevalida URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:182
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Fuŝa adreso %s"
 
-#: LYMessages.c:158
+#: LYMessages.c:183
 #, c-format
 msgid "URL: %s"
-msgstr "Retadreso: %s"
+msgstr "URL: %s"
 
-#: LYMessages.c:159
+#: LYMessages.c:184
 msgid "Unable to access WWW file!!!"
 msgstr "Ne eblas atingi TTT-dosieron!"
 
-#: LYMessages.c:160
+#: LYMessages.c:185
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Ĉi tio estas serĉebla indekso. Uzu la klavon %s por serĉi."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:162
+#: LYMessages.c:187
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Plu-- Ĉi tio estas serĉebla indekso. Uzu la klavon %s por serĉi."
 
-#: LYMessages.c:163
+#: LYMessages.c:188
 msgid "You have entered an invalid link number."
 msgstr "Vi enmetis nevalidan ligilan numeron."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:165
+#: LYMessages.c:190
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Nune vidatan dokumentan fontotekston. Premu la klavon '\\' por reveni al interpretita versio."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:167
+#: LYMessages.c:192
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
-msgstr "Sagoklavoj: Supra kaj suba por movi. Dekstra por sekvi ligilon. Maldekstra por retroiri.\n"
+msgstr "Sagoklavoj: Supra kaj malsupra por movi. Dekstra por sekvi ligilon. Maldekstra por retroiri.\n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:169
+#: LYMessages.c:194
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr "H)elpo O) Agordo P)rinti G) Iri M) Ĉefa fako Q) Eliri /=serĉi [retropaŝo]=historio \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:171
+#: LYMessages.c:196
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "O) Aliaj komandoj H)elpo K)lavomapo G) Ŝalti P)rinti M) Ĉefa fako O) Agordaĵoj Q) Eliri  \n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:173
+#: LYMessages.c:198
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "  O) Aliaj komandoj B) Retropaŝi E) Redakti D) Elŝuti ^R)eŝargi ^W) Forviŝi ekranon  serĉi en dokumento: / \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:175
+#: LYMessages.c:200
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O) Aliaj komandoj C) Komenti Historio: <Retropaŝo> Legosignoj: V)idi, A)ldoni, R) Forigi \n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:177
+#: LYMessages.c:202
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "           Enmetu tekston en la kampon per tajpado en la klavaro              "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:179
+#: LYMessages.c:204
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "    ^U por forviŝi la kampon, [Retropaŝo] por forigi signon    "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:181
+#: LYMessages.c:206
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "    ^U por forviŝi la kampon, [Retropaŝo] por forigi signon    "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:183
+#: LYMessages.c:208
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "    %s por forviŝi la kampon, [Retropaŝo] por forigi signon    "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:185
+#: LYMessages.c:210
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "    %s por forviŝi la kampon, [Retropaŝo] por forigi signon    "
 
 #. mailto
-#: LYMessages.c:188
+#: LYMessages.c:213
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Misformita retpoŝta sendaĵo! Nuligita!"
 
-#: LYMessages.c:189
+#: LYMessages.c:214
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Averto! Stirkodoj en retpoŝtadreso anstataŭiĝintaj per '?'"
 
-#: LYMessages.c:190
+#: LYMessages.c:215
 msgid "Mail disallowed!  Cannot submit."
 msgstr "Retpoŝto malpermesita! Ne eblas sendi."
 
-#: LYMessages.c:191
+#: LYMessages.c:216
 msgid "Mailto form submission failed!"
 msgstr "Retpoŝta sendado malsukcesis!"
 
-#: LYMessages.c:192
+#: LYMessages.c:217
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Retpoŝta sendado nuligita!"
 
-#: LYMessages.c:193
+#: LYMessages.c:218
 msgid "Sending form content..."
 msgstr "Sendante formularan enhavon..."
 
-#: LYMessages.c:194
+#: LYMessages.c:219
 msgid "No email address is present in mailto URL!"
-msgstr "Neniu retpoŝtadreso ekzistas en la retadreso!"
+msgstr "Neniu retpoŝtadreso ekzistas en la URL!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:196
+#: LYMessages.c:221
 msgid "Unable to open temporary file for mailto URL!"
-msgstr "Ne eblas malfermi provizoran dosieron por retadreson!"
+msgstr "Ne eblas malfermi provizoran dosieron por URL-on!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:223
 msgid "Do you wish to include the original message?"
 msgstr "Ĉu vi volas inkluzivi la fontan mesaĝon?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:200
+#: LYMessages.c:225
 msgid "Do you wish to include the preparsed source?"
 msgstr "Ĉu vi volas inkluzivi la interpretitan fontotekston?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:202
+#: LYMessages.c:227
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Plenumiganta vian tekstoredaktilon por redakti retleteron"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:204
+#: LYMessages.c:229
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "Eraro dum plenumigi tekstoredaktilon. Kontrolu viajn agordaĵojn"
 
-#: LYMessages.c:205
+#: LYMessages.c:230
 msgid "Send this comment?"
 msgstr "Ĉu sendi la komenton?"
 
-#: LYMessages.c:206
+#: LYMessages.c:231
 msgid "Send this message?"
 msgstr "Ĉu sendi la mesaĝon?"
 
-#: LYMessages.c:207
+#: LYMessages.c:232
 msgid "Sending your message..."
 msgstr "Sendante vian mesaĝon..."
 
-#: LYMessages.c:208
+#: LYMessages.c:233
 msgid "Sending your comment:"
 msgstr "Sendante vian komenton:"
 
 #. textarea
-#: LYMessages.c:211
+#: LYMessages.c:236
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Ne en TEKSTREGIONO; ne eblas uzi eksteran tekstoredaktilon."
 
-#: LYMessages.c:212
+#: LYMessages.c:237
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Ne en TEKSTREGIONO; ne eblas uzi komandon."
 
-#: LYMessages.c:214
+#: LYMessages.c:239
 msgid "file: ACTIONs are disallowed!"
 msgstr "Agoj ĉe lokaj dosieroj estas malpermesitaj!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:216
+#: LYMessages.c:241
 msgid "file: URLs via served links are disallowed!"
 msgstr "Lokaj servintaj ligiloj estas malpermesitaj!"
 
-#: LYMessages.c:217
+#: LYMessages.c:242
 msgid "Access to local files denied."
 msgstr "Atingo de lokaj dosieroj rifuzita."
 
-#: LYMessages.c:218
+#: LYMessages.c:243
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "Lokaj dokumentoj en legosignoj estas malpermesitaj!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:220
+#: LYMessages.c:245
 msgid "This special URL is not allowed in external documents!"
-msgstr "Ĉi tiu speciala retadreso ne estas permesita en eksteraj dokumentoj!"
+msgstr "Ĉi tiu speciala URL ne estas permesita en eksteraj dokumentoj!"
 
-#: LYMessages.c:221
+#: LYMessages.c:246
 msgid "Press <return> to return to Lynx."
-msgstr "Premu enen-klavon por reiri al Linko."
+msgstr "Premu enen-klavon por reiri al Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:224
+#: LYMessages.c:249
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
-msgstr "Kreante DCL-subprocezon. Uzu la komandon 'logout' por reiri al Linko.\n"
+msgstr "Kreante DCL-subprocezon. Uzu la komandon 'logout' por reiri al Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:228
+#: LYMessages.c:253
 msgid "Type EXIT to return to Lynx.\n"
-msgstr "Tajpu la vorton EXIT por reiri al Linko.\n"
+msgstr "Tajpu la vorton EXIT por reiri al Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:231
+#: LYMessages.c:256
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
-msgstr "Kreante vian aprioran ŝelon. Tajpu la vorton 'exit' por reiri al Linko.\n"
+msgstr "Kreante vian aprioran ŝelon. Tajpu la vorton 'exit' por reiri al Lynx.\n"
 
-#: LYMessages.c:234
+#: LYMessages.c:259
 msgid "Spawning is currently disabled."
 msgstr "Krei procezoj ne estas permesitaj."
 
-#: LYMessages.c:235
+#: LYMessages.c:260
 msgid "The 'd'ownload command is currently disabled."
-msgstr "Elŝuti per la komando 'd' aktuale estas malaktivigita."
+msgstr "Elŝuti per la komando 'd' nune estas malaktivigita."
 
-#: LYMessages.c:236
+#: LYMessages.c:261
 msgid "You cannot download an input field."
 msgstr "Vi ne rajtas elŝuti tekstan kampon."
 
-#: LYMessages.c:237
+#: LYMessages.c:262
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Formularo havas retpoŝtan agon! Ne eblas elŝuti."
 
-#: LYMessages.c:238
+#: LYMessages.c:263
 msgid "You cannot download a mailto: link."
 msgstr "vi ne eblas elŝuti retpoŝtan ligilon."
 
-#: LYMessages.c:239
+#: LYMessages.c:264
 msgid "You cannot download cookies."
 msgstr "Vi ne rajtas elŝuti kuketojn."
 
-#: LYMessages.c:240
+#: LYMessages.c:265
 msgid "You cannot download a printing option."
 msgstr "Vi ne rajtas elŝuti printan elekton."
 
-#: LYMessages.c:241
+#: LYMessages.c:266
 msgid "You cannot download an upload option."
 msgstr "Vi ne rajtas elŝuti alŝutan elekton."
 
-#: LYMessages.c:242
+#: LYMessages.c:267
 msgid "You cannot download an permit option."
 msgstr "Vi ne rajtas elŝuti permesan elekton."
 
-#: LYMessages.c:243
+#: LYMessages.c:268
 msgid "This special URL cannot be downloaded!"
-msgstr "Ĉi tia speciala retadreso ne estas elŝutebla!"
+msgstr "Ĉi tia speciala URL ne estas elŝutebla!"
 
-#: LYMessages.c:244
+#: LYMessages.c:269
 msgid "Nothing to download."
 msgstr "Neniu por elŝuti."
 
-#: LYMessages.c:245
+#: LYMessages.c:270
 msgid "Trace ON!"
 msgstr "Spurado ŜALTITA!"
 
-#: LYMessages.c:246
+#: LYMessages.c:271
 msgid "Trace OFF!"
 msgstr "Spurado MALŜALTITA!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:248
+#: LYMessages.c:273
 msgid "Links will be included for all images!  Reloading..."
 msgstr "LIGILOJ estos inkluzivitaj por ĉiuj bildoj! Reŝarganta..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:250
+#: LYMessages.c:275
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Kutima bildo-traktado restarigita! Reŝarganta..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:252
+#: LYMessages.c:277
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "Afabla anstataŭ teksto por bildoj estas enmetita kiam necesa! Reŝarganta..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:254
+#: LYMessages.c:279
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Bildoj kiam anstataŭa teksto estos ignoritaj! Reŝarganta..."
 
-#: LYMessages.c:255
+#: LYMessages.c:280
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Nuda 8-bita aŭ ĈJK-a reĝimo MALŜALTITA. Reŝarganta..."
 
-#: LYMessages.c:256
+#: LYMessages.c:281
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Nuda 8-bita aŭ ĈJK-a reĝimo ŜALTITA. Reŝarganta..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:258
+#: LYMessages.c:283
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Sendi kapo-peton por D)okumento aŭ L)igilo, aŭ C) Nuligi? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:260
+#: LYMessages.c:285
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Sendi kapo-peton por D)okumento, aŭ C) Nuligi? (d,c): "
 
-#: LYMessages.c:261
+#: LYMessages.c:286
 msgid "Sorry, the document is not an http URL."
-msgstr "Bedaŭrinde la retadreso ne estas HTTP-a."
+msgstr "Bedaŭrinde la URL ne estas HTTP-a."
 
-#: LYMessages.c:262
+#: LYMessages.c:287
 msgid "Sorry, the link is not an http URL."
 msgstr "Bedaŭrinde la ligilo ne estas HTTP-a."
 
-#: LYMessages.c:263
+#: LYMessages.c:288
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Bedaŭrinde la AGO de la formularo estas malaktivigita."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:265
+#: LYMessages.c:290
 msgid "Sorry, the ACTION for this form is not an http URL."
-msgstr "Bedaŭrinde la AGO por la formularo ne estas HTTP-retadreso."
+msgstr "Bedaŭrinde la AGO por la formularo ne estas HTTP-URL."
 
-#: LYMessages.c:266
+#: LYMessages.c:291
 msgid "Not an http URL or form ACTION!"
-msgstr "Ne estas HTTP-retadreso aŭ formulara AGO!"
+msgstr "Ne estas HTTP-URL aŭ formulara AGO!"
 
-#: LYMessages.c:267
+#: LYMessages.c:292
 msgid "This special URL cannot be a form ACTION!"
-msgstr "Ĉi tia speciala retadreso ne eblas esti formulara AGO!"
+msgstr "Ĉi tia speciala URL ne eblas esti formulara AGO!"
 
-#: LYMessages.c:268
+#: LYMessages.c:293
 msgid "URL is not in starting realm!"
-msgstr "Retadreso ne estas en komenca regno!"
+msgstr "URL ne estas en komenca regno!"
 
-#: LYMessages.c:269
+#: LYMessages.c:294
 msgid "News posting is disabled!"
 msgstr "Ne eblas afiŝi al novaĵgrupoj"
 
-#: LYMessages.c:270
+#: LYMessages.c:295
 msgid "File management support is disabled!"
 msgstr "Dosieradministrada regado estas malaktivigita!"
 
-#: LYMessages.c:271
+#: LYMessages.c:296
 msgid "No jump file is currently available."
-msgstr "Neniu saltodosiero estas aktuale havebla."
+msgstr "Neniu saltodosiero estas nune disponebla."
 
-#: LYMessages.c:272
+#: LYMessages.c:297
 msgid "Jump to (use '?' for list): "
 msgstr "Salti al (uzu la klavon '?' por listo): "
 
-#: LYMessages.c:273
+#: LYMessages.c:298
 msgid "Jumping to a shortcut URL is disallowed!"
-msgstr "Salti al mallonga retadreso estas malpermesita!"
+msgstr "Salti al mallonga URL estas malpermesita!"
 
-#: LYMessages.c:274
+#: LYMessages.c:299
 msgid "Random URL is disallowed!  Use a shortcut."
-msgstr "Hazardaj retadresoj estas malpermesitaj. Uzi mallongigo."
+msgstr "Hazarda URL estas malpermesita. Uzi mallongigo."
 
-#: LYMessages.c:275
+#: LYMessages.c:300
 msgid "No random URLs have been used thus far."
-msgstr "Ankoraŭ neniuj hazardaj retadresoj estis uzitaj."
+msgstr "Ankoraŭ neniuj hazardaj URL-oj estas uzitaj."
 
-#: LYMessages.c:276
+#: LYMessages.c:301
 msgid "Bookmark features are currently disabled."
-msgstr "Legosignaj trajtoj aktuale estas malaktivigitaj."
+msgstr "Legosignaj trajtoj nune estas malaktivigitaj."
 
-#: LYMessages.c:277
+#: LYMessages.c:302
 msgid "Execution via bookmarks is disabled."
 msgstr "Plenumo per legosignoj estas malaktivigita."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:279
+#: LYMessages.c:304
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Legosigna dosiero ne estas difinita. Uzu la klavon %s por vidi agordaĵojn."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:281
+#: LYMessages.c:306
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Ne eblas malfermi provizoran dosieron por konvertado de X-Mosaic legosignojn."
 
-#: LYMessages.c:282
+#: LYMessages.c:307
 msgid "ERROR - unable to open bookmark file."
 msgstr "ERARO - ne eblas malfermi legosignan dosieron."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:284
+#: LYMessages.c:309
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Ne eblas malfermi legosignan dosieron por forigi de ligilo."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:286
+#: LYMessages.c:311
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Ne eblas malfermi provizoran dosieron por forigi ligilon."
 
-#: LYMessages.c:288
+#: LYMessages.c:313
 msgid "Error renaming scratch file."
 msgstr "Eraro alinomanta provizoran dosieron."
 
-#: LYMessages.c:290
+#: LYMessages.c:315
 msgid "Error renaming temporary file."
 msgstr "Eraro alinomanta provizoran dosieron."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:292
+#: LYMessages.c:317
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Ne eblas kopii provizoran dosieron por forigi ligilon."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:294
+#: LYMessages.c:319
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Ne eblas remalfermi provizoran dosieron por forigi ligilon."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:297
+#: LYMessages.c:322
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Ligilo ne estas sola en unuopa linio en legosigna dosiero."
 
-#: LYMessages.c:298
+#: LYMessages.c:323
 msgid "Bookmark deletion failed."
 msgstr "Legosigna forigo malsukcesis"
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:300
+#: LYMessages.c:325
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Legosignaj dosieroj ne eblas esti travenitaj (nur HTTP-adresoj)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:302
+#: LYMessages.c:327
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Ne eblas malfermi legosignan dosieron. Uzu la klavon 'a' por konservi ligilon."
 
-#: LYMessages.c:303
+#: LYMessages.c:328
 msgid "There are no links in this bookmark file!"
 msgstr "Ne ekzistas ligiloj en ĉi tiu legosigna dosiero!"
 
 #. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:305
+#: LYMessages.c:330
 msgid "D)elete cached document or C)ancel? (d,c): "
 msgstr "D)okumunton en la tenejo forigu aŭ C) Nuligi? (d,c)"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:307
+#: LYMessages.c:332
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Konservi D)okumenton aŭ L)igilon al legosigna dosiero aŭ C) Nuligi? (d, l, c): "
 
-#: LYMessages.c:308
+#: LYMessages.c:333
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Konservi D)okumenton al legosignan dosiero aŭ C) Nuligi? (d,c)"
 
-#: LYMessages.c:309
+#: LYMessages.c:334
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Konservi L)igilon al legosigna dosiero aŭ C) Nuligi? (l,c)"
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:311
+#: LYMessages.c:336
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Dokumentoj de formularoj kun kaŝita enhavo ne eblas esti konservitaj kiel legosignoj."
 
-#: LYMessages.c:312
+#: LYMessages.c:337
 msgid "Cannot save form fields/links"
-msgstr "Ne eblas konservi kampojn/ligilojn"
+msgstr "Ne eblas konservi formulariajn kampojn/ligilojn"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:314
+#: LYMessages.c:339
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Historio, informoj, menuo kaj listoj ne eblas estis konservitaj kiel legosignoj."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:316
+#: LYMessages.c:341
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Ĉu vi efektive volas forigi ĉi tiun ligilon de via legosigna dosiero?"
 
-#: LYMessages.c:317
+#: LYMessages.c:342
 msgid "Malformed address."
-msgstr "Malbone formita retadreso."
+msgstr "Malbone formita URL."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:319
+#: LYMessages.c:344
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Historia komento-interpretado ŜALTITA (Minimuma estas malaktiva)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:321
+#: LYMessages.c:346
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Historia komento-interpretado MALŜALTITA (Minimuma estas aktiva)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:323
+#: LYMessages.c:348
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Historia komento-interpretado ŜALTITA (Valida estas malaktiva)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:325
+#: LYMessages.c:350
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Historia komento-interpretado MALŜALTITA (Valida estas aktiva)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:327
+#: LYMessages.c:352
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Minimuma komento-interpretado ŜALTITA (kaj aktiva)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:329
+#: LYMessages.c:354
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Minimuma komento-interpretado MALŜALTITA (Valida estas aktiva)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:331
+#: LYMessages.c:356
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Minimuma komento-interpretado ŜALTITA (sed Historia estas aktiva)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:333
+#: LYMessages.c:358
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Minimuma komento-interpretado MALŜALTITA (Historia estas aktiva)!"
 
-#: LYMessages.c:334
+#: LYMessages.c:359
 msgid "Soft double-quote parsing ON!"
 msgstr "Molaj citiloj ŜALTITA!"
 
-#: LYMessages.c:335
+#: LYMessages.c:360
 msgid "Soft double-quote parsing OFF!"
 msgstr "Molaj citiloj MALŜALTITA!"
 
-#: LYMessages.c:336
+#: LYMessages.c:361
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Uzanta malseveran interpretadon de HTML."
 
-#: LYMessages.c:337
+#: LYMessages.c:362
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Uzanta severan interpretadon de HTML."
 
-#: LYMessages.c:338
+#: LYMessages.c:363
 msgid "You are already at the end of this document."
 msgstr "Vi jam estas je la fino de ĉi tiu dokumento."
 
-#: LYMessages.c:339
+#: LYMessages.c:364
 msgid "You are already at the beginning of this document."
 msgstr "Vi jam estas je la komenco de ĉi tiu dokumento."
 
-#: LYMessages.c:340
+#: LYMessages.c:365
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Vi jam estas ĉe ekranpleno %d de ĉi tiu dokumento."
 
-#: LYMessages.c:341
+#: LYMessages.c:366
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Ligila numero %d jam estas nuna."
 
-#: LYMessages.c:342
+#: LYMessages.c:367
 msgid "You are already at the first document"
 msgstr "Vi jam estas je la unua dokumento"
 
-#: LYMessages.c:343
+#: LYMessages.c:368
 msgid "There are no links above this line of the document."
 msgstr "Ne estas ligiloj supra al ĉi tiu linio de la dokumento."
 
-#: LYMessages.c:344
+#: LYMessages.c:369
 msgid "There are no links below this line of the document."
-msgstr "Ne estas ligiloj suba al ĉi tiu linio de la dokumento."
+msgstr "Ne estas ligiloj sube de ĉi tiu linio de la dokumento."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:346
+#: LYMessages.c:371
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Maksimuma longo atingita. Forigi tekston aŭ movi de ĝi."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:348
+#: LYMessages.c:373
 msgid "You are not on a form submission button or normal link."
 msgstr "Vi ne estas en formulara sendobutono aŭ ordinara ligilo."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:350
+#: LYMessages.c:375
 msgid "One radio button must be checked at all times!"
 msgstr "Unu radiobutono ĉiam devas markita!"
 
-#: LYMessages.c:351
+#: LYMessages.c:376
 msgid "No submit button for this form, submit single text field?"
 msgstr "Neniu sendobutono por la formularo, ĉu sendi unuopan tekstan kampon?"
 
-#: LYMessages.c:352
+#: LYMessages.c:377
 msgid "Do you want to go back to the previous document?"
 msgstr "Ĉu vi volas retroiri?"
 
-#: LYMessages.c:353
+#: LYMessages.c:378
 msgid "Use arrows or tab to move off of field."
 msgstr "Uzu sagoklavojn aŭ tabon por movi de la kampon."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:355
+#: LYMessages.c:380
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Enmetu tekston. Uzu sagoklavojn aŭ tabon por movi de la kampo."
 
-#: LYMessages.c:356
+#: LYMessages.c:381
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Fuŝa HTML! Neniu formulara ago difinita. **"
 
-#: LYMessages.c:357
+#: LYMessages.c:382
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Fuŝa HTML! Ne eblas krei ŝprucaĵon."
 
-#: LYMessages.c:358
+#: LYMessages.c:383
 msgid "Unable to create popup window!"
 msgstr "Ne eblas krei ŝprucaĵon."
 
-#: LYMessages.c:359
+#: LYMessages.c:384
 msgid "Goto a random URL is disallowed!"
-msgstr "Salti hazardajn retadresojn estas malpermesitaj!"
+msgstr "Salti hazardan URL-on estas malpermesitaj!"
 
-#: LYMessages.c:360
+#: LYMessages.c:385
 msgid "Goto a non-http URL is disallowed!"
-msgstr "Salti tian retadreson estas malpermesite."
+msgstr "Salti tian URL-on estas malpermesite."
 
-#: LYMessages.c:361
+#: LYMessages.c:386
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
-msgstr "Vi ne rajtas iri al retadresoj de \"%s\""
+msgstr "Vi ne rajtas iri al URL-oj de \"%s\""
 
-#: LYMessages.c:362
+#: LYMessages.c:387
 msgid "URL to open: "
-msgstr "Ironta retadreso: "
+msgstr "Ironta URL: "
 
-#: LYMessages.c:363
+#: LYMessages.c:388
 msgid "Edit the current Goto URL: "
-msgstr "Redakti la aktualan retadreson: "
+msgstr "Redakti la nunan URL-on: "
 
-#: LYMessages.c:364
+#: LYMessages.c:389
 msgid "Edit the previous Goto URL: "
-msgstr "Redakti la antaŭan irintan retadreson: "
+msgstr "Redakti la antaŭan irintan URL-on: "
 
-#: LYMessages.c:365
+#: LYMessages.c:390
 msgid "Edit a previous Goto URL: "
-msgstr "Redakti antaŭan irintan retadreson: "
+msgstr "Redakti antaŭan irintan URL-on: "
 
-#: LYMessages.c:366
+#: LYMessages.c:391
 msgid "Current document has POST data."
 msgstr "Nuna dokumento havas kaŝitajn datumojn."
 
-#: LYMessages.c:367
+#: LYMessages.c:392
 msgid "Edit this document's URL: "
-msgstr "Ŝanĝi la aktualan retadreson: "
+msgstr "Ŝanĝi la nunan URL-on: "
 
-#: LYMessages.c:368
+#: LYMessages.c:393
 msgid "Edit the current link's URL: "
-msgstr "Redakti la retadreson de la nuna ligilo: "
+msgstr "Redakti la URL-on de la nuna ligilo: "
 
-#: LYMessages.c:369
+#: LYMessages.c:394
 msgid "Edit the form's submit-URL: "
-msgstr "Ŝanĝi la sendo-retadreson de la formularo: "
+msgstr "Ŝanĝi la sendo-URL-on de la formularo: "
 
-#: LYMessages.c:370
+#: LYMessages.c:395
 msgid "You cannot edit File Management URLs"
-msgstr "Vi ne rajtas redakti dosieradministradajn retadresojn"
+msgstr "Vi ne rajtas redakti dosieradministradajn URL-ojn"
 
-#: LYMessages.c:371
+#: LYMessages.c:396
 msgid "Enter a database query: "
 msgstr "Enmetu datumbazan mendon: "
 
-#: LYMessages.c:372
+#: LYMessages.c:397
 msgid "Enter a whereis query: "
 msgstr "Serĉi en la vidata dokumento: "
 
-#: LYMessages.c:373
+#: LYMessages.c:398
 msgid "Edit the current query: "
 msgstr "Redakti la nunan mendon:"
 
-#: LYMessages.c:374
+#: LYMessages.c:399
 msgid "Edit the previous query: "
 msgstr "Redakti la antaŭan mendon: "
 
-#: LYMessages.c:375
+#: LYMessages.c:400
 msgid "Edit a previous query: "
 msgstr "Redakti antaŭan mendon: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:377
+#: LYMessages.c:402
 msgid "Use Control-R to resubmit the current query."
 msgstr "^R por resendi la nunan mendon."
 
-#: LYMessages.c:378
+#: LYMessages.c:403
 msgid "Edit the current shortcut: "
 msgstr "Redakti la nunan mallongigon: "
 
-#: LYMessages.c:379
+#: LYMessages.c:404
 msgid "Edit the previous shortcut: "
 msgstr "Redakti la antaŭan mallongigon: "
 
-#: LYMessages.c:380
+#: LYMessages.c:405
 msgid "Edit a previous shortcut: "
 msgstr "Redakti antaŭan mallongigon: "
 
-#: LYMessages.c:381
+#: LYMessages.c:406
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Klavo '%c' ne estas agordita al saltodosiero!"
 
-#: LYMessages.c:382
+#: LYMessages.c:407
 msgid "Cannot locate jump file!"
 msgstr "Ne eblas loki saltodosieron!"
 
-#: LYMessages.c:383
+#: LYMessages.c:408
 msgid "Cannot open jump file!"
 msgstr "Ne eblas malfermi saltodosieron!"
 
-#: LYMessages.c:384
+#: LYMessages.c:409
 msgid "Error reading jump file!"
 msgstr "Eraro dum legado de saltodosiero!"
 
-#: LYMessages.c:385
+#: LYMessages.c:410
 msgid "Out of memory reading jump file!"
 msgstr "Maltro da memoro por legi saltodosieron."
 
-#: LYMessages.c:386
+#: LYMessages.c:411
 msgid "Out of memory reading jump table!"
 msgstr "Maltro da memoro por legi saltotabelon."
 
-#: LYMessages.c:387
+#: LYMessages.c:412
 msgid "No index is currently available."
-msgstr "Neniu indekso aktuale disponeblas."
+msgstr "Neniu indekso nun disponeblas."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:389
+#: LYMessages.c:414
 msgid "Do you really want to go to the Main screen?"
 msgstr "Ĉu vi efektive volas iri al la ĉefa fako?"
 
-#: LYMessages.c:390
+#: LYMessages.c:415
 msgid "You are already at main screen!"
 msgstr "Vi jam estas en la ĉefa fako!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:392
+#: LYMessages.c:417
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Ne serĉebla indicita dokumento. Prume la klavon '/' por serĉi tekstan ĉenon"
 
 #. #define NO_OWNER
-#: LYMessages.c:394
+#: LYMessages.c:419
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Neniu estro estas difinita por ĉi tiu dosiero, do vi ne eblas sendi komenton."
 
-#: LYMessages.c:395
+#: LYMessages.c:420
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Neniu estro estas difinita. Ĉu uzu je %s?"
 
-#: LYMessages.c:396
+#: LYMessages.c:421
 msgid "Do you wish to send a comment?"
 msgstr "Ĉu vi volas sendi komenton?"
 
-#: LYMessages.c:397
+#: LYMessages.c:422
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "Retpoŝto estas malaktiva. Vi ne rajtas sendi komenton."
 
-#: LYMessages.c:398
+#: LYMessages.c:423
 msgid "The 'e'dit command is currently disabled."
-msgstr "Redaktado aktuale estas malebligita."
+msgstr "Redaktado nune estas malaktivigita."
 
-#: LYMessages.c:399
+#: LYMessages.c:424
 msgid "External editing is currently disabled."
-msgstr "Ekstera redakto aktuale estas malebligita."
+msgstr "Ekstera redakto nune estas malaktivigita."
 
-#: LYMessages.c:400
+#: LYMessages.c:425
 msgid "System error - failure to get status."
 msgstr "Sistema eraro - malsukceso atingi staton."
 
-#: LYMessages.c:401
+#: LYMessages.c:426
 msgid "No editor is defined!"
 msgstr "Neniu tekstoredaktilo estas difinita!"
 
-#: LYMessages.c:402
+#: LYMessages.c:427
 msgid "The 'p'rint command is currently disabled."
-msgstr "Printado aktuale estas malebligita."
+msgstr "Printado nune estas malaktivigita."
 
-#: LYMessages.c:403
+#: LYMessages.c:428
 msgid "Document has no Toolbar links or Banner."
 msgstr "Dokumento havas neniun ilobretajn ligilojn aŭ ŝildon."
 
-#: LYMessages.c:404
+#: LYMessages.c:429
 msgid "Unable to open traversal file."
 msgstr "Ne eblas malfermi trairan dosieron."
 
-#: LYMessages.c:405
+#: LYMessages.c:430
 msgid "Unable to open traversal found file."
 msgstr "Ne eblas trovi dosieron."
 
-#: LYMessages.c:406
+#: LYMessages.c:431
 msgid "Unable to open reject file."
 msgstr "Ne eblas malfermi la dosieron."
 
-#: LYMessages.c:407
+#: LYMessages.c:432
 msgid "Unable to open traversal errors output file"
 msgstr "Ne eblas malfermi trairo-eraran dosieron"
 
-#: LYMessages.c:408
+#: LYMessages.c:433
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "TRAIRO ESTIS INTERROMPITA"
 
-#: LYMessages.c:409
+#: LYMessages.c:434
 msgid "Follow link (or goto link or page) number: "
 msgstr "Sekvi ligilan (aŭ iri al ligila aŭ paĝa) numeron: "
 
-#: LYMessages.c:410
+#: LYMessages.c:435
 msgid "Select option (or page) number: "
 msgstr "Elekti elektan (aŭ paĝon) numeron: "
 
-#: LYMessages.c:411
+#: LYMessages.c:436
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Elekta numero %d jam estas nuna."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:413
+#: LYMessages.c:438
 msgid "You are already at the end of this option list."
-msgstr "Vi jam estas je la fino de la elektilo."
+msgstr "Vi jam estas je la fino de la elekto-listo."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:415
+#: LYMessages.c:440
 msgid "You are already at the beginning of this option list."
-msgstr "Vi jam estas je la komencoo de la elektilo."
+msgstr "Vi jam estas je la komencoo de la elekto-listo."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:417
+#: LYMessages.c:442
 #, c-format
 msgid "You are already at page %d of this option list."
-msgstr "Vi jam estas je ekranpleno %d de la elektilo."
+msgstr "Vi jam estas je ekranpleno %d de la elekto-listo."
 
-#: LYMessages.c:418
+#: LYMessages.c:443
 msgid "You have entered an invalid option number."
 msgstr "Vi enmetis nevalidan elektan numeron."
 
-#: LYMessages.c:419
+#: LYMessages.c:444
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Fuŝa HTML! Uzu la parametron -trace por diagnozi."
 
-#: LYMessages.c:420
+#: LYMessages.c:445
 msgid "Give name of file to save in"
 msgstr "Donu nomon de dosiero en kiu konservi"
 
-#: LYMessages.c:421
+#: LYMessages.c:446
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Ne eblas konservi datumojn al dosiero -- Bonvolu loke fari"
 
-#: LYMessages.c:422
+#: LYMessages.c:447
 msgid "Can't open temporary file!"
 msgstr "Ne eblas malfermi provizoran dosieron!"
 
-#: LYMessages.c:423
+#: LYMessages.c:448
 msgid "Can't open output file!  Cancelling!"
 msgstr "Ne eblas malfermi eligan dosieron! Nuliganta!"
 
-#: LYMessages.c:424
+#: LYMessages.c:449
 msgid "Execution is disabled."
-msgstr "Plenumo estas malebligita."
+msgstr "Plenumo estas malaktivigita."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:426
+#: LYMessages.c:451
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Plenumo ne estas ebla por ĉi tiu dosiero. Uzu la agordilon (klavo %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:428
+#: LYMessages.c:453
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Plenumeblaj kapabloj ne estas en ĉi tiu versio."
 
-#: LYMessages.c:429
+#: LYMessages.c:454
 msgid "This file cannot be displayed on this terminal."
 msgstr "La dosiero ne estas montrebla."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:431
+#: LYMessages.c:456
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "La dosiero ne estas montrebla. D) Elŝuti, aŭ C) Nuligi"
 
-#: LYMessages.c:432
+#: LYMessages.c:457
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s D) Elŝuti, aŭ C) Nuligi"
 
-#: LYMessages.c:433
+#: LYMessages.c:458
 msgid "Cancelling file."
 msgstr "Nuliganta dosieron."
 
-#: LYMessages.c:434
+#: LYMessages.c:459
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Ricevanta dosieron. - BONVOLU ATENDI -"
 
-#: LYMessages.c:435
+#: LYMessages.c:460
 msgid "Enter a filename: "
 msgstr "Enmetu dosiernomon: "
 
-#: LYMessages.c:436
+#: LYMessages.c:461
 msgid "Edit the previous filename: "
 msgstr "Redakti antaŭan dosiernomon: "
 
-#: LYMessages.c:437
+#: LYMessages.c:462
 msgid "Edit a previous filename: "
 msgstr "Redakti antaŭan dosiernomon: "
 
-#: LYMessages.c:438
+#: LYMessages.c:463
 msgid "Enter a new filename: "
 msgstr "Enmetu novan dosiernomon:"
 
-#: LYMessages.c:439
+#: LYMessages.c:464
 msgid "File name may not begin with a dot."
 msgstr "Dosiernome ne eblas komenci per punkto."
 
-#: LYMessages.c:441
+#: LYMessages.c:466
 msgid "File exists.  Create higher version?"
 msgstr "Dosiero ekzistas. Ĉu krei pli novan eldonon?"
 
-#: LYMessages.c:443
+#: LYMessages.c:468
 msgid "File exists.  Overwrite?"
 msgstr "Dosiero ekzistas. Ĉu anstataŭi?"
 
-#: LYMessages.c:445
+#: LYMessages.c:470
 msgid "Cannot write to file."
 msgstr "Ne eblas skribi al dosiero."
 
-#: LYMessages.c:446
+#: LYMessages.c:471
 msgid "ERROR! - download command is misconfigured."
 msgstr "ERARO! - Ne eblas elŝuti."
 
-#: LYMessages.c:447
+#: LYMessages.c:472
 msgid "Unable to download file."
 msgstr "Ne eblas elŝuti dosieron."
 
-#: LYMessages.c:448
+#: LYMessages.c:473
 msgid "Reading directory..."
 msgstr "Leganta dosierujon..."
 
-#: LYMessages.c:449
+#: LYMessages.c:474
 msgid "Building directory listing..."
 msgstr "Munti dosierujan liston..."
 
-#: LYMessages.c:450
+#: LYMessages.c:475
 msgid "Saving..."
 msgstr "Konservanta..."
 
-#: LYMessages.c:451
+#: LYMessages.c:476
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Ne povis redakti dosieron '%s'."
 
-#: LYMessages.c:452
+#: LYMessages.c:477
 msgid "Unable to access document!"
 msgstr "Ne eblas atingi dokumenton!"
 
-#: LYMessages.c:453
+#: LYMessages.c:478
 msgid "Could not access file."
 msgstr "Ne eblas atingi dosieron."
 
-#: LYMessages.c:454
+#: LYMessages.c:479
 msgid "Could not access directory."
 msgstr "Ne povis atingi dosierujon."
 
-#: LYMessages.c:455
+#: LYMessages.c:480
 msgid "Could not load data."
 msgstr "Ne eblas ŝargi datumojn."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:457
+#: LYMessages.c:482
 msgid "Lynx cannot currently (e)dit remote WWW files."
-msgstr "Linko aktuale ne eblas redakti forajn TTT-dosierojn."
+msgstr "Lynx nune ne eblas redakti forajn TTT-dosierojn."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:459
+#: LYMessages.c:484
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "La kampo ne eblas esti ekstere redaktita."
 
-#: LYMessages.c:460
+#: LYMessages.c:485
 msgid "Bad rule"
 msgstr "Fuŝa regulo"
 
-#: LYMessages.c:461
+#: LYMessages.c:486
 msgid "Insufficient operands:"
 msgstr "Fuŝaj operaciiloj:"
 
-#: LYMessages.c:462
+#: LYMessages.c:487
 msgid "You are not authorized to edit this file."
 msgstr "Vi ne permesas redakti ĉi tiun doseron."
 
-#: LYMessages.c:463
+#: LYMessages.c:488
 msgid "Title: "
 msgstr "Titolo: "
 
-#: LYMessages.c:464
+#: LYMessages.c:489
 msgid "Subject: "
 msgstr "Temo: "
 
-#: LYMessages.c:465
+#: LYMessages.c:490
 msgid "Username: "
 msgstr "Salutnomo: "
 
-#: LYMessages.c:466
+#: LYMessages.c:491
 msgid "Password: "
 msgstr "Pasvorto: "
 
-#: LYMessages.c:467
+#: LYMessages.c:492
 msgid "lynx: Username and Password required!!!"
 msgstr "Salutnomo kaj pasvorto necesaj!"
 
-#: LYMessages.c:468
+#: LYMessages.c:493
 msgid "lynx: Password required!!!"
 msgstr "Pasvorto necesa!"
 
-#: LYMessages.c:469
+#: LYMessages.c:494
 msgid "Clear all authorization info for this session?"
 msgstr "Ĉu forviŝi ĉiujn atestajn informojn por ĉi tiu seanco?"
 
-#: LYMessages.c:470
+#: LYMessages.c:495
 msgid "Authorization info cleared."
 msgstr "Atestaj informoj forviŝitaj."
 
-#: LYMessages.c:471
+#: LYMessages.c:496
 msgid "Authorization failed.  Retry?"
 msgstr "Atestado malsukcesis. Ĉu reprovi?"
 
-#: LYMessages.c:472
+#: LYMessages.c:497
 msgid "cgi support has been disabled."
 msgstr "CGI-regade estas malaktivigita."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:474
+#: LYMessages.c:499
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "CGI-kapabloj ne estas en ĉi tiu versio."
 
-#: LYMessages.c:475
+#: LYMessages.c:500
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Ne eblas konverti el %s al %s."
 
-#: LYMessages.c:476
+#: LYMessages.c:501
 msgid "Unable to set up connection."
 msgstr "Ne eblas aranĝi konekton."
 
-#: LYMessages.c:477
+#: LYMessages.c:502
 msgid "Unable to make connection"
 msgstr "Ne eblas starigi konekto"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:479
+#: LYMessages.c:504
 msgid "Executable link rejected due to malformed request."
 msgstr "Plenumebla ligilo rifuzita pro fuŝa peto."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:506
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Plenumebla ligilo rifuzita pro signo '%c'."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:483
+#: LYMessages.c:508
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Plenumebla ligilo rifuzita pro relativa voja ĉeno ('.../')."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:485
+#: LYMessages.c:510
 msgid "Executable link rejected due to location or path."
 msgstr "Plenumebla ligilo rifuzita pro loko aŭ vojo."
 
-#: LYMessages.c:486
+#: LYMessages.c:511
 msgid "Mail access is disabled!"
-msgstr "Retpoŝta atingo estas malebligita!"
+msgstr "Retpoŝta atingo estas malaktivigita!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:488
+#: LYMessages.c:513
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Nur dosieroj kaj serviloj en la loka komputilo estas atingeblaj."
 
-#: LYMessages.c:489
+#: LYMessages.c:514
 msgid "Telnet access is disabled!"
-msgstr "Atingo al Telnet malebligita!"
+msgstr "Telnet-atingo malaktivigita!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:491
+#: LYMessages.c:516
 msgid "Telnet port specifications are disabled."
-msgstr "Specifoj pri Telnet-pordoj estas malebligitaj."
+msgstr "Specifoj pri Telnet-pordoj estas malaktivigitaj."
 
-#: LYMessages.c:492
+#: LYMessages.c:517
 msgid "USENET news access is disabled!"
-msgstr "USENET estas malebligita!"
+msgstr "USENET-atingo estas malaktivigita!"
 
-#: LYMessages.c:493
+#: LYMessages.c:518
 msgid "Rlogin access is disabled!"
-msgstr "RLogin estas malebligita!"
+msgstr "Rlogin-atingo estas malaktivigita!"
 
-#: LYMessages.c:494
+#: LYMessages.c:519
 msgid "Ftp access is disabled!"
-msgstr "FTP estas malebligita!"
+msgstr "FTP-atingo estas malaktivigita!"
 
-#: LYMessages.c:495
+#: LYMessages.c:520
 msgid "There are no references from this document."
 msgstr "Ne ekzistas referencoj de ĉi tiu dokumento."
 
-#: LYMessages.c:496
+#: LYMessages.c:521
 msgid "There are only hidden links from this document."
 msgstr "Ekzistas nur kaŝitaj ligiloj de ĉi tiu dokumento."
 
-#: LYMessages.c:498
+#: LYMessages.c:523
 msgid "Unable to open command file."
 msgstr "Ne eblas malfermi komandan dosieron."
 
-#: LYMessages.c:500
+#: LYMessages.c:525
 msgid "News Post Cancelled!!!"
 msgstr "Afiŝo nuligita!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:502
+#: LYMessages.c:527
 msgid "Spawning your selected editor to edit news message"
 msgstr "Plenumanta vian elektitan redaktilon por redakti la mesaĝon"
 
-#: LYMessages.c:503
+#: LYMessages.c:528
 msgid "Post this message?"
 msgstr "Ĉu afiŝi ĉi tiun mesaĝon?"
 
-#: LYMessages.c:504
+#: LYMessages.c:529
 #, c-format
 msgid "Append '%s'?"
 msgstr "Ĉu almeti je '%s'?"
 
-#: LYMessages.c:505
+#: LYMessages.c:530
 msgid "Posting to newsgroup(s)..."
 msgstr "Afiŝanta al novaĵgrupo(j)..."
 
-#: LYMessages.c:507
+#: LYMessages.c:532
 msgid "*** You have unread mail. ***"
 msgstr "*** Vi havas nelegitajn retmesaĝojn. ***"
 
-#: LYMessages.c:509
+#: LYMessages.c:534
 msgid "*** You have mail. ***"
 msgstr "*** Vi havas retmesaĝojn. ***"
 
-#: LYMessages.c:511
+#: LYMessages.c:536
 msgid "*** You have new mail. ***"
 msgstr "*** Vi havas novajn retmesaĝojn. ***"
 
-#: LYMessages.c:512
+#: LYMessages.c:537
 msgid "File insert cancelled!!!"
 msgstr "Dosiera enmetado nuligita!"
 
-#: LYMessages.c:513
+#: LYMessages.c:538
 msgid "Not enough memory for file!"
 msgstr "Nesufiĉa memoro por dosiero!"
 
-#: LYMessages.c:514
+#: LYMessages.c:539
 msgid "Can't open file for reading."
 msgstr "Ne eblas malfermi dosieron por legado."
 
-#: LYMessages.c:515
+#: LYMessages.c:540
 msgid "File does not exist."
 msgstr "Dosiero ne ekzistas."
 
-#: LYMessages.c:516
+#: LYMessages.c:541
 msgid "File does not exist - reenter or cancel:"
 msgstr "Dosiero ne ekzistas - reeniri aŭ nuligi:"
 
-#: LYMessages.c:517
+#: LYMessages.c:542
 msgid "File is not readable."
 msgstr "Dosiero nelegeblas."
 
-#: LYMessages.c:518
+#: LYMessages.c:543
 msgid "File is not readable - reenter or cancel:"
 msgstr "Dosiero ne estas legebla - reeniri aŭ nuligi:"
 
-#: LYMessages.c:519
+#: LYMessages.c:544
 msgid "Nothing to insert - file is 0-length."
 msgstr "Nenio por enmeti - dosiero estas vaka."
 
-#: LYMessages.c:520
+#: LYMessages.c:545
 msgid "Save request cancelled!!!"
 msgstr "Konservado de pote nuligita!"
 
-#: LYMessages.c:521
+#: LYMessages.c:546
 msgid "Mail request cancelled!!!"
 msgstr "Retpoŝta peto nuligita!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:523
+#: LYMessages.c:548
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Vidanta interpretitan fontotekston. Ĉu vi certas, ke vi volas sendi ĝin per retpoŝto?"
 
-#: LYMessages.c:524
+#: LYMessages.c:549
 msgid "Please wait..."
 msgstr "Bonvolu atendi..."
 
-#: LYMessages.c:525
+#: LYMessages.c:550
 msgid "Mailing file.  Please wait..."
 msgstr "Bonvolu atendi dum sendi la dosieron per retpoŝto..."
 
-#: LYMessages.c:526
+#: LYMessages.c:551
 msgid "ERROR - Unable to mail file"
 msgstr "ERARO - Ne eblas sendi dosieron per retpoŝto"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:528
+#: LYMessages.c:553
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Dosiero estas %d ekranplenoj. Ĉu vi certas, ke vi volas printi?"
 
-#: LYMessages.c:529
+#: LYMessages.c:554
 msgid "Print request cancelled!!!"
 msgstr "Printa peto nuligita!"
 
-#: LYMessages.c:530
+#: LYMessages.c:555
 msgid "Press <return> to begin: "
 msgstr "Premu enen-klavon por komenci: "
 
-#: LYMessages.c:531
+#: LYMessages.c:556
 msgid "Press <return> to finish: "
 msgstr "Premu enen-klavon por fini: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:533
+#: LYMessages.c:558
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Dosiero estas %d ekranplenoj. Ĉu vi certas, ke vi volas printi?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:535
+#: LYMessages.c:560
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Certigu, ke via printilo estas konektita. Premu enen-klavon por printi:"
 
-#: LYMessages.c:536
+#: LYMessages.c:561
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "ERARO - Ne eblas akiri dosieran spacon!"
 
-#: LYMessages.c:537
+#: LYMessages.c:562
 msgid "Unable to open tempfile"
 msgstr "Ne eblas malfermi provizoran dosieron"
 
-#: LYMessages.c:538
+#: LYMessages.c:563
 msgid "Unable to open print options file"
 msgstr "Ne eblas malfermi printo-agordan dosieron"
 
-#: LYMessages.c:539
+#: LYMessages.c:564
 msgid "Printing file.  Please wait..."
 msgstr "Printanta dosieron. Bonvolu atendi..."
 
-#: LYMessages.c:540
+#: LYMessages.c:565
 msgid "Please enter a valid internet mail address: "
 msgstr "Bonvolu enmeti validan retpoŝtadreson: "
 
-#: LYMessages.c:541
+#: LYMessages.c:566
 msgid "ERROR! - printer is misconfigured!"
 msgstr "ERARO! - Printilo estas malĝuste agordita!"
 
-#: LYMessages.c:542
+#: LYMessages.c:567
 msgid "Image map from POST response not available!"
 msgstr "Bildmapo de kaŝita respondo ne disponeblas!"
 
-#: LYMessages.c:543
+#: LYMessages.c:568
 msgid "Misdirected client-side image MAP request!"
 msgstr "Malĝuste direktita enklienta bildmapa peto!"
 
-#: LYMessages.c:544
+#: LYMessages.c:569
 msgid "Client-side image MAP is not accessible!"
 msgstr "Enklienta bildmapo ne atingeblas!"
 
-#: LYMessages.c:545
+#: LYMessages.c:570
 msgid "No client-side image MAPs are available!"
 msgstr "Neniuj enklientaj bildmapoj disponeblas!"
 
-#: LYMessages.c:546
+#: LYMessages.c:571
 msgid "Client-side image MAP is not available!"
 msgstr "Enklienta bildmapo ne disponeblas!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:549
+#: LYMessages.c:574
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Ekrana alto devas esti minimume 24 linioj por la agordilo!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:551
+#: LYMessages.c:576
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Ekrana alto devas esti minimume 23 linioj por la agordilo!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:553
+#: LYMessages.c:578
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Ekrana alto devas esti minimume 22 linioj por la agordilo!"
 
-#: LYMessages.c:555
+#: LYMessages.c:580
 msgid "That key requires Advanced User mode."
 msgstr "Tiu klavo bezonas altnivelan uzantareĝimon."
 
-#: LYMessages.c:556
+#: LYMessages.c:581
 #, c-format
 msgid "Content-type: %s"
 msgstr "Enhavtipo: %s"
 
-#: LYMessages.c:557
+#: LYMessages.c:582
 msgid "Command: "
 msgstr "Komando"
 
-#: LYMessages.c:558
+#: LYMessages.c:583
 msgid "Unknown or ambiguous command"
 msgstr "Nekonata aŭ neklara komando"
 
-#: LYMessages.c:559
+#: LYMessages.c:584
 msgid " Version "
 msgstr " Versio "
 
-#: LYMessages.c:560
+#: LYMessages.c:585
 msgid " first"
 msgstr " antaŭ aliaj"
 
-#: LYMessages.c:561
+#: LYMessages.c:586
 msgid ", guessing..."
 msgstr ", provanta korekti..."
 
-#: LYMessages.c:562
+#: LYMessages.c:587
 msgid "Permissions for "
 msgstr "Permesoj por"
 
-#: LYMessages.c:563
+#: LYMessages.c:588
 msgid "Select "
 msgstr "Elekti"
 
-#: LYMessages.c:564
+#: LYMessages.c:589
 msgid "capital letter"
 msgstr "Majusklo"
 
-#: LYMessages.c:565
+#: LYMessages.c:590
 msgid " of option line,"
 msgstr " de agorda linio,"
 
-#: LYMessages.c:566
+#: LYMessages.c:591
 msgid " to save,"
 msgstr " por konservi,"
 
-#: LYMessages.c:567
+#: LYMessages.c:592
 msgid " to "
 msgstr " al"
 
-#: LYMessages.c:568
+#: LYMessages.c:593
 msgid " or "
 msgstr " aŭ"
 
-#: LYMessages.c:569
+#: LYMessages.c:594
 msgid " index"
 msgstr " indekso"
 
-#: LYMessages.c:570
+#: LYMessages.c:595
 msgid " to return to Lynx."
-msgstr " por reiri al Linko."
+msgstr " por reiri al Lynx."
 
-#: LYMessages.c:571
+#: LYMessages.c:596
 msgid "Accept Changes"
 msgstr "Akcepti ŝanĝojn"
 
-#: LYMessages.c:572
+#: LYMessages.c:597
 msgid "Reset Changes"
 msgstr "Restarigi ŝanĝojn"
 
-#: LYMessages.c:573
+#: LYMessages.c:598
 msgid "Left Arrow cancels changes"
 msgstr "Maldekstra sagoklavo nuligas ŝanĝojn"
 
-#: LYMessages.c:574
+#: LYMessages.c:599
 msgid "Save options to disk"
 msgstr "Konservi agordaĵojn al la disko"
 
-#: LYMessages.c:575
+#: LYMessages.c:600
 msgid "Hit RETURN to accept entered data."
 msgstr "Premu enen-klavon por akcepti enmetitajn datumojn."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:577
+#: LYMessages.c:602
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Enmetu enen-klavon por akcepti enmetitajn datumojn. Forigi datumojn por alvoki la aprioran."
 
-#: LYMessages.c:578
+#: LYMessages.c:603
 msgid "Value accepted!"
 msgstr "Valoro akceptita!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:580
+#: LYMessages.c:605
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
-msgstr "Valoro akceptita! -- AVERTO: Linko estas agordita por la fenestrosistemo X"
+msgstr "Valoro akceptita! -- AVERTO: Lynx estas agordita por la fenestrosistemo X"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:582
+#: LYMessages.c:607
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
-msgstr "Valoro akceptita! -- AVERTO: Linko NE estas agordita por la fenestrosistemo X"
+msgstr "Valoro akceptita! -- AVERTO: Lynx NE estas agordita por la fenestrosistemo X"
 
-#: LYMessages.c:583
+#: LYMessages.c:608
 msgid "You are not allowed to change which editor to use!"
 msgstr "Vi ne estas permesata ŝanĝi vian tekstoredaktilon!"
 
-#: LYMessages.c:584
+#: LYMessages.c:609
 msgid "Failed to set DISPLAY variable!"
 msgstr "Malsukcesis valorizi medivariablon DISPLAY!"
 
-#: LYMessages.c:585
+#: LYMessages.c:610
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Malsukcesis forviŝi medivariablon DISPLAY!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:587
+#: LYMessages.c:612
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Vi ne estas permesita ŝanĝi la legosignan dosieron!"
 
-#: LYMessages.c:588
+#: LYMessages.c:613
 msgid "Terminal does not support color"
 msgstr "Terminalo ne havas kolorojn"
 
-#: LYMessages.c:589
+#: LYMessages.c:614
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Via terminalo '%s' ne havas kolorojn."
 
-#: LYMessages.c:590
+#: LYMessages.c:615
 msgid "Access to dot files is disabled!"
-msgstr "Atingo al kaŝitaj dosieroj estas malebligita!"
+msgstr "Atingo al kaŝitaj dosieroj estas malaktivigita!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:592
+#: LYMessages.c:617
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
-msgstr "Via TTT-legilo ne identigas sin kiel Linkon"
+msgstr "Via TTT-legila ĉeno enhavas nek \"Lynx\" nek \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:594
+#: LYMessages.c:619
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Uzu la ĉenojn \"L_y_n_x\" aŭ \"Lynx\" por identigi la TTT-legilon por eviti aspekti intence trompa."
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:596
+#: LYMessages.c:621
 msgid "Changing of the User-Agent string is disabled!"
-msgstr "Ŝanĝi la TTT-legilan identigon estas malebligite!"
+msgstr "Ŝanĝi la TTT-legilan identigon estas malaktivigite!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:598
+#: LYMessages.c:623
 msgid "You are not allowed to change this setting."
 msgstr "Vi ne estas permesata ŝanĝi tiun agordaĵon."
 
-#: LYMessages.c:599
+#: LYMessages.c:624
 msgid "Saving Options..."
 msgstr "Konservanta agordaĵojn..."
 
-#: LYMessages.c:600
+#: LYMessages.c:625
 msgid "Options saved!"
 msgstr "Agordaĵoj konservitaj!"
 
-#: LYMessages.c:601
+#: LYMessages.c:626
 msgid "Unable to save Options!"
 msgstr "Ne eblas konservi agordaĵojn!"
 
-#: LYMessages.c:602
+#: LYMessages.c:627
 msgid " 'r' to return to Lynx "
-msgstr " 'r' por reiri al Linko "
+msgstr " 'r' por reiri al Lynx "
 
-#: LYMessages.c:603
+#: LYMessages.c:628
 msgid " '>' to save, or 'r' to return to Lynx "
-msgstr " '>' por konservi, aŭ 'r' por reiri al Linko "
+msgstr " '>' por konservi, aŭ 'r' por reiri al Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:605
+#: LYMessages.c:630
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Premu iun klavon por ŝanĝi valoron; enen-klavon por akcepti"
 
-#: LYMessages.c:606
+#: LYMessages.c:631
 msgid "Error uncompressing temporary file!"
 msgstr "Eraro dum malpaki provizoran dosieron!"
 
-#: LYMessages.c:607
+#: LYMessages.c:632
 msgid "Unsupported URL scheme!"
-msgstr "Ne komprenas la retadresan skemon!"
+msgstr "Ne komprenas la URL-skemon!"
 
-#: LYMessages.c:608
+#: LYMessages.c:633
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
-msgstr "Ne komprenas la datuman retadreson. Uzu la komando SHOWINFO nune."
+msgstr "Ne komprenas la datuman URL-on. Uzu la komando SHOWINFO nune."
 
-#: LYMessages.c:609
+#: LYMessages.c:634
 msgid "Redirection limit of 10 URL's reached."
-msgstr "Alidirektada limigo de 10 retadresoj atingita."
+msgstr "Alidirektada limigo de 10 URL-oj atingita."
 
-#: LYMessages.c:610
+#: LYMessages.c:635
 msgid "Illegal redirection URL received from server!"
-msgstr "Nevalida alidirektada retadreso ricevita el servilo!"
+msgstr "Nevalida alidirektada URL ricevita el servilo!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:612
+#: LYMessages.c:637
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Servila petita por %d alidirektadoj de kaŝita enhavo al"
 
-#: LYMessages.c:615
+#: LYMessages.c:640
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P) Daŭrigi, G) Malkaŝi, aŭ C) Nuligi"
 
-#: LYMessages.c:616
+#: LYMessages.c:641
 msgid "P)roceed, or C)ancel "
 msgstr "P) Daŭrigi, aŭ C) Nuligi"
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:618
+#: LYMessages.c:643
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
-msgstr "Alidirektado de kaŝita enhavo. P) Daŭrigi, U) vidi retadreson, G) Malkaŝi, aŭ C) Nuligi"
+msgstr "Alidirektado de kaŝita enhavo. P) Daŭrigi, U) vidi URL-on, G) Malkaŝi, aŭ C) Nuligi"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:620
+#: LYMessages.c:645
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
-msgstr "Alidirektado de kaŝita enhavo. P) Daŭrigi, U) Vidi retadreson, aŭ C) Nuligi"
+msgstr "Alidirektado de kaŝita enhavo. P) Daŭrigi, U) Vidi URL-on, aŭ C) Nuligi"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:622
+#: LYMessages.c:647
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Dokumento kun kaŝita enhavo. Ĉu resendi?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:624
+#: LYMessages.c:649
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Resendi kaŝitan enhavon al %s ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:626
+#: LYMessages.c:651
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Listo el dokumento kun kaŝitaj datumoj. Ĉu reŝargi je %s ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:628
+#: LYMessages.c:653
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Dokumento kun kaŝita enhavo, ricevado de kapo eble ne kompreniĝos. Ĉu daŭri?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:630
+#: LYMessages.c:655
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Formularo kun kaŝita enhavo, ricevado de kapo eble ne kompreniĝos. Ĉu daŭri?"
 
-#: LYMessages.c:631
+#: LYMessages.c:656
 msgid "Proceed without a username and password?"
 msgstr "Ĉu daŭri sen salutnomo kaj pasvorto?"
 
-#: LYMessages.c:632
+#: LYMessages.c:657
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Ĉu daŭri (%s)?"
 
-#: LYMessages.c:633
+#: LYMessages.c:658
 msgid "Cannot POST to this host."
 msgstr "Ne eblas sendi kaŝitajn datumojn al tiu retnodo."
 
-#: LYMessages.c:634
+#: LYMessages.c:659
 msgid "POST not supported for this URL - ignoring POST data!"
-msgstr "Tiu retadreso ne komprenas kaŝitan enhavon - ignoranta!"
+msgstr "Tiu URL ne komprenas kaŝitan enhavon - ignoranta!"
 
-#: LYMessages.c:635
+#: LYMessages.c:660
 msgid "Discarding POST data..."
 msgstr "Forĵetanta kaŝitajn datumojn..."
 
-#: LYMessages.c:636
+#: LYMessages.c:661
 msgid "Document will not be reloaded!"
 msgstr "Dokumento ne estos reŝargita!"
 
-#: LYMessages.c:637
+#: LYMessages.c:662
 msgid "Location: "
 msgstr "Loko: "
 
-#: LYMessages.c:638
+#: LYMessages.c:663
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' ne trovita!"
 
-#: LYMessages.c:639
+#: LYMessages.c:664
 msgid "Default Bookmark File"
 msgstr "Apriora legosigna dosiero"
 
-#: LYMessages.c:640
+#: LYMessages.c:665
 msgid "Screen too small! (8x35 min)"
 msgstr "Ekrano tro malgranda! (minimume 8 de 35 rastrumeroj)"
 
-#: LYMessages.c:641
+#: LYMessages.c:666
 msgid "Select destination or ^G to Cancel: "
 msgstr "Elektu celon aŭ ^G por nuligi: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:643
+#: LYMessages.c:668
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Elekti sublegosignon, '=' por menuo, aŭ ^G por nuligi: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:645
+#: LYMessages.c:670
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "Kloni L)igilon en ĉi tiu legosigna dosiero aŭ C) Nuligi? (l,c): "
 
-#: LYMessages.c:646
+#: LYMessages.c:671
 msgid "Multiple bookmark support is not available."
 msgstr "Plurnivelaj legosignoj estas ne disponeblaj."
 
-#: LYMessages.c:647
+#: LYMessages.c:672
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Elektu legosignon (ekranpleno %d el %d)"
 
-#: LYMessages.c:648
+#: LYMessages.c:673
 msgid "       Select Bookmark"
 msgstr "       Elekti legosignon"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:650
+#: LYMessages.c:675
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Redaktanta la priskribon kaj vojon de legosigno (%d el 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:652
+#: LYMessages.c:677
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Redaktanta la priskribon kaj vojon de legosigno"
 
-#: LYMessages.c:653
+#: LYMessages.c:678
 msgid "Letter: "
 msgstr "Litero: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:656
+#: LYMessages.c:681
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Uzu dosiervojon de via hejmdosierujo laŭ SHELL-sintakso!"
 
-#: LYMessages.c:658
+#: LYMessages.c:683
 msgid "Use a filepath off your home directory!"
 msgstr "Uzu dosiervojon de via hejmdosierujo."
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:661
+#: LYMessages.c:686
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Maksimumaj ligiloj je ĉiu ekranpleno preteriris! Uzu duonekranplenan aŭ dulinian rulumadon."
 
-#: LYMessages.c:662
+#: LYMessages.c:687
 msgid "No previously visited links available!"
-msgstr "Neniuj antaŭe vizititaj ligiloj haveblaj!"
+msgstr "Neniuj antaŭe vizititaj ligiloj disponeblaj!"
 
-#: LYMessages.c:663
+#: LYMessages.c:688
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Uzis la tuton de la memoro! Programo ĉesigita!"
 
-#: LYMessages.c:664
+#: LYMessages.c:689
 msgid "Memory exhausted!  Aborting..."
 msgstr "Uzis la tuton de la memoro! Ĉesiganta..."
 
-#: LYMessages.c:665
+#: LYMessages.c:690
 msgid "Not enough memory!"
 msgstr "Ne sufiĉo da memoro!"
 
-#: LYMessages.c:666
+#: LYMessages.c:691
 msgid "Directory/File Manager not available"
 msgstr "Dosieradministrilo ne disponeblas"
 
-#: LYMessages.c:667
+#: LYMessages.c:692
 msgid "HREF in BASE tag is not an absolute URL."
-msgstr "Baza retadreso de la paĝo ne estas absoluta."
+msgstr "Baza URL de la paĝo ne estas absoluta."
 
-#: LYMessages.c:668
+#: LYMessages.c:693
 msgid "Location URL is not absolute."
-msgstr "Loko-retadreso ne estas absoluta."
+msgstr "Loko-URL ne estas absoluta."
 
-#: LYMessages.c:669
+#: LYMessages.c:694
 msgid "Refresh URL is not absolute."
-msgstr "Reŝarga retadreso ne estas absoluta."
+msgstr "Reŝarga URL ne estas absoluta."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:671
+#: LYMessages.c:696
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2052,7 +2120,7 @@ msgstr ""
 "Vi sendas mesaĝon kun korpo al:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:697
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2060,7 +2128,7 @@ msgstr ""
 "Vi sendas komenton al:\n"
 "  "
 
-#: LYMessages.c:673
+#: LYMessages.c:698
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2070,7 +2138,7 @@ msgstr ""
 " Kun kopio al:\n"
 " "
 
-#: LYMessages.c:674
+#: LYMessages.c:699
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2081,7 +2149,7 @@ msgstr ""
 " "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:676
+#: LYMessages.c:701
 msgid ""
 "\n"
 "\n"
@@ -2092,7 +2160,7 @@ msgstr ""
 "^G por nuligi, se vi ne volas sendi mesaĝon\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:678
+#: LYMessages.c:703
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2101,7 +2169,7 @@ msgstr ""
 " Bonvolu enmeti vian nomon, aŭ restigi ĝin vaka por resti sennoma\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:680
+#: LYMessages.c:705
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2110,11 +2178,11 @@ msgstr ""
 " Bonvolu enmeti retpoŝtadreson aŭ iun alian\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:682
+#: LYMessages.c:707
 msgid " means to contact you, if you desire a response.\n"
 msgstr " maniero por kontakti vin, se vi deziras respondon.\n"
 
-#: LYMessages.c:683
+#: LYMessages.c:708
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2123,7 +2191,7 @@ msgstr ""
 " Bonvolu enmeti unulinian temon.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:685
+#: LYMessages.c:710
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2131,11 +2199,11 @@ msgstr ""
 "\n"
 " Enmetu retpoŝtadreson por kopio de la mesaĝo.\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:711
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Restigu vaka, se vi ne volas kopion.)\n"
 
-#: LYMessages.c:687
+#: LYMessages.c:712
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2145,7 +2213,7 @@ msgstr ""
 " Bonvolu kontroli la mesaĝan korpon:\n"
 "\n"
 
-#: LYMessages.c:688
+#: LYMessages.c:713
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2153,7 +2221,7 @@ msgstr ""
 "\n"
 "Premu enen-klavon por daŭri: "
 
-#: LYMessages.c:689
+#: LYMessages.c:714
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2161,11 +2229,11 @@ msgstr ""
 "\n"
 "Premu enen-klavon por purigi: "
 
-#: LYMessages.c:690
+#: LYMessages.c:715
 msgid " Use Control-U to erase the default.\n"
 msgstr " Uzu la klavon ^U por forviŝi la jaman.\n"
 
-#: LYMessages.c:691
+#: LYMessages.c:716
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2174,7 +2242,7 @@ msgstr ""
 "Bonvolu enmeti vian mesaĝon sube."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:693 src/LYNews.c:360
+#: LYMessages.c:718 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2183,7 +2251,7 @@ msgstr ""
 " Kiam finita, premu la enen-klavon kaj klavu unuopan punkton (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:695 src/LYNews.c:361
+#: LYMessages.c:720 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2193,257 +2261,257 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:724
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s kuketo: %.*s=%.*s Ĉu Permesi? (J/N/ĉiAm/nEniam)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:726
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Ĉu akcepti nevalidan kuketon domajno=%s por '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:703
+#: LYMessages.c:728
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Ĉu akcepti nevalidan kuketon vojo=%s kiel prefikson de '%s'?"
 
-#: LYMessages.c:704
+#: LYMessages.c:729
 msgid "Allowing this cookie."
 msgstr "Permesanta ĉi tiun kuketon."
 
-#: LYMessages.c:705
+#: LYMessages.c:730
 msgid "Rejecting this cookie."
 msgstr "Rifuzanta ĉi tiun kuketon."
 
-#: LYMessages.c:706
+#: LYMessages.c:731
 msgid "The Cookie Jar is empty."
 msgstr "La kuketo-skatolo estas vaka."
 
-#: LYMessages.c:707
+#: LYMessages.c:732
 msgid "The Cache Jar is empty."
 msgstr "La tenejo-skatolo estas vaka."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:709
+#: LYMessages.c:734
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Aktivigi ligilojn por vori kuketojn aŭ tutajn domajnojn"
 
-#: LYMessages.c:710
+#: LYMessages.c:735
 msgid "or to change a domain's 'allow' setting."
 msgstr "aŭ por ŝanĝi permeson de domajno."
 
-#: LYMessages.c:711
+#: LYMessages.c:736
 msgid "(Cookies never allowed.)"
 msgstr "(Kuketoj neniam permesitaj.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:737
 msgid "(Cookies always allowed.)"
 msgstr "(Kuketoj ĉiam permesitaj.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:738
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Kuketoj permesitaj per demandilo.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:739
 msgid "(Persistent Cookies.)"
 msgstr "(Daŭrantaj kuketoj.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:740
 msgid "(No title.)"
 msgstr "(Neniu titolo.)"
 
-#: LYMessages.c:716
+#: LYMessages.c:741
 msgid "(No name.)"
 msgstr "(Neniu nomo.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:742
 msgid "(No value.)"
 msgstr "(Neniu valoro.)"
 
-#: LYMessages.c:718 src/LYOptions.c:2409
+#: LYMessages.c:743 src/LYOptions.c:2424
 msgid "None"
 msgstr "Neniu(j)"
 
-#: LYMessages.c:719
+#: LYMessages.c:744
 msgid "(End of session.)"
 msgstr "(Fino de seanco.)"
 
-#: LYMessages.c:720
+#: LYMessages.c:745
 msgid "Delete this cookie?"
 msgstr "Ĉu forigi ĉi tiun kuketon?"
 
-#: LYMessages.c:721
+#: LYMessages.c:746
 msgid "The cookie has been eaten!"
 msgstr "La kuketo estas manĝita!"
 
-#: LYMessages.c:722
+#: LYMessages.c:747
 msgid "Delete this empty domain?"
 msgstr "Ĉu forigi la vakan domajnon?"
 
-#: LYMessages.c:723
+#: LYMessages.c:748
 msgid "The domain has been eaten!"
 msgstr "La domajno estis manĝita!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:725
+#: LYMessages.c:750
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)omajnan kuketon forigi, permesu A) Ĉiam/P) Demandi/V) Neniam, aŭ C) Nuligi?"
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:727
+#: LYMessages.c:752
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)omajnon forigi, permesu A) Ĉiam/P) Demandi/V) Neniam, aŭ C) Nuligi?"
 
-#: LYMessages.c:728
+#: LYMessages.c:753
 msgid "All cookies in the domain have been eaten!"
 msgstr "Ĉiuj kuketoj en la domajno estis manĝitaj!"
 
-#: LYMessages.c:729
+#: LYMessages.c:754
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "'A' por ĉiam permesi el la domajno '%s'."
 
-#: LYMessages.c:730
+#: LYMessages.c:755
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "'V' por neniam permesi el la domajno '%s'."
 
-#: LYMessages.c:731
+#: LYMessages.c:756
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "'P' por demandilo por domajno '%s'."
 
-#: LYMessages.c:732
+#: LYMessages.c:757
 msgid "Delete all cookies in this domain?"
 msgstr "Ĉu forigi ĉiujn kuketojn en ĉi tiu domajno?"
 
-#: LYMessages.c:733
+#: LYMessages.c:758
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Ĉiuj kuketoj en la skatolo estis manĝitaj!"
 
-#: LYMessages.c:735
+#: LYMessages.c:760
 msgid "Port 19 not permitted in URLs."
-msgstr "Pordo 19 ne estas permesata en retadresoj."
+msgstr "Pordo 19 ne estas permesata en URL-oj."
 
-#: LYMessages.c:736
+#: LYMessages.c:761
 msgid "Port 25 not permitted in URLs."
-msgstr "Pordo 19 ne estas permesata en retadresoj."
+msgstr "Pordo 19 ne estas permesata en URL-oj."
 
-#: LYMessages.c:737
+#: LYMessages.c:762
 #, c-format
 msgid "Port %lu not permitted in URLs."
-msgstr "Pordo %lu ne estas permesata en retadresoj."
+msgstr "Pordo %lu ne estas permesata en URL-oj."
 
-#: LYMessages.c:738
+#: LYMessages.c:763
 msgid "URL has a bad port field."
-msgstr "Retadreso havas fuŝan pordon."
+msgstr "URL havas fuŝan pordon."
 
-#: LYMessages.c:739
+#: LYMessages.c:764
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Superfluis maksimuma nestado de HTML-elementoj."
 
-#: LYMessages.c:740
+#: LYMessages.c:765
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Fuŝa parta refero! Foriganta komencajn punktoj."
 
-#: LYMessages.c:741
+#: LYMessages.c:766
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Malsukcesis malfermi la spuran protokolon. Malŝaltita."
 
-#: LYMessages.c:742
+#: LYMessages.c:767
 msgid "Lynx Trace Log"
-msgstr "Spura protokolo de Linko"
+msgstr "Spura protokolo de Lynx"
 
-#: LYMessages.c:743
+#: LYMessages.c:768
 msgid "No trace log has been started for this session."
 msgstr "Neniu spura protokolo estis komencita por ĉi tiu seanco."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:745
+#: LYMessages.c:770
 msgid "The maximum temporary file count has been reached!"
 msgstr "La maksimuma nombro provizoraj dosieroj estis atingita!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:747
+#: LYMessages.c:772
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Valoro de formulara kampo estas tro granda por la bufro. Tranĉu la voston!"
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:749
+#: LYMessages.c:774
 msgid "Modified tail combined with head of form field value."
 msgstr "Modifita vosto kun kunigita kun kapo de formulara kampa valoro."
 
 #. HTFile.c
-#: LYMessages.c:752
+#: LYMessages.c:777
 msgid "Directory"
 msgstr "Dosierujo"
 
-#: LYMessages.c:753
+#: LYMessages.c:778
 msgid "Directory browsing is not allowed."
 msgstr "Dosieruja foliumado estas ne permesata."
 
-#: LYMessages.c:754
+#: LYMessages.c:779
 msgid "Selective access is not enabled for this directory"
 msgstr "Elektebla atingo ne estas ebla por ĉi tiu dosierujo"
 
-#: LYMessages.c:755
+#: LYMessages.c:780
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: dosieruja skano malsukcesis."
 
-#: LYMessages.c:756
+#: LYMessages.c:781
 msgid "This directory is not readable."
 msgstr "Ĉi tiu dosierujo ne legeblas."
 
-#: LYMessages.c:757
+#: LYMessages.c:782
 msgid "Can't access requested file."
 msgstr "Ne eblas atingi petitan dosieron."
 
-#: LYMessages.c:758
+#: LYMessages.c:783
 msgid "Could not find suitable representation for transmission."
 msgstr "Ne povis trovi taŭgan prezentadon por elsendi."
 
-#: LYMessages.c:759
+#: LYMessages.c:784
 msgid "Could not open file for decompression!"
 msgstr "Ne povis malfermi malpakotan dosieron!"
 
-#: LYMessages.c:760
+#: LYMessages.c:785
 msgid "Files:"
 msgstr "Dosieroj:"
 
-#: LYMessages.c:761
+#: LYMessages.c:786
 msgid "Subdirectories:"
 msgstr "Subdosierujoj:"
 
-#: LYMessages.c:762
+#: LYMessages.c:787
 msgid " directory"
 msgstr " dosierujo"
 
-#: LYMessages.c:763
+#: LYMessages.c:788
 msgid "Up to "
 msgstr "Supren ĝis "
 
-#: LYMessages.c:764
+#: LYMessages.c:789
 msgid "Current directory is "
-msgstr "Aktuala dosierujo estas "
+msgstr "Nuna dosierujo estas "
 
 #. HTFTP.c
-#: LYMessages.c:767
+#: LYMessages.c:792
 msgid "Symbolic Link"
 msgstr "Mola ligilo"
 
 #. HTGopher.c
-#: LYMessages.c:770
+#: LYMessages.c:795
 msgid "No response from server!"
 msgstr "Neniu respondo el servilo!"
 
-#: LYMessages.c:771
+#: LYMessages.c:796
 msgid "CSO index"
 msgstr "CSO-indekso"
 
-#: LYMessages.c:772
+#: LYMessages.c:797
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2451,16 +2519,16 @@ msgstr ""
 "\n"
 "Ĉi tiu estas serĉebla indekso de CSO-datumbazo.\n"
 
-#: LYMessages.c:773
+#: LYMessages.c:798
 msgid "CSO Search Results"
 msgstr "CSO-serĉo-rezultoj"
 
-#: LYMessages.c:774
+#: LYMessages.c:799
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Malsukceso pri trovado je %s\n"
 
-#: LYMessages.c:775
+#: LYMessages.c:800
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2468,7 +2536,7 @@ msgstr ""
 "\n"
 "Premu la klavon 's' kaj enmetu serĉo-ŝlosilvortojn.\n"
 
-#: LYMessages.c:776
+#: LYMessages.c:801
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2476,35 +2544,35 @@ msgstr ""
 "\n"
 "Ĉi tiu estas serĉebla Gopher-indekso.\n"
 
-#: LYMessages.c:777
+#: LYMessages.c:802
 msgid "Gopher index"
 msgstr "Gopher-indekso"
 
-#: LYMessages.c:778
+#: LYMessages.c:803
 msgid "Gopher Menu"
 msgstr "Gopher-menuo"
 
-#: LYMessages.c:779
+#: LYMessages.c:804
 msgid " Search Results"
 msgstr " Serĉo-rezultoj"
 
-#: LYMessages.c:780
+#: LYMessages.c:805
 msgid "Sending CSO/PH request."
 msgstr "Sendante CSO-peton."
 
-#: LYMessages.c:781
+#: LYMessages.c:806
 msgid "Sending Gopher request."
 msgstr "Sendante Gopher-peton."
 
-#: LYMessages.c:782
+#: LYMessages.c:807
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO-peto sendita; atendanta respondon."
 
-#: LYMessages.c:783
+#: LYMessages.c:808
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher-peto sendita; atendanta respondon."
 
-#: LYMessages.c:784
+#: LYMessages.c:809
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2512,7 +2580,7 @@ msgstr ""
 "\n"
 "Bonvolu enmeti serĉo-ŝlosilvortoj.\n"
 
-#: LYMessages.c:785
+#: LYMessages.c:810
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2520,267 +2588,271 @@ msgstr ""
 "\n"
 "La ŝlosilvortoj, kiujn vi enmetas, permesos, ke vi serĉu pri"
 
-#: LYMessages.c:786
+#: LYMessages.c:811
 msgid " person's name in the database.\n"
 msgstr " nomo de persono en la datumbazo.\n"
 
 #. HTNews.c
-#: LYMessages.c:789
+#: LYMessages.c:814
 msgid "Connection closed ???"
 msgstr "Konekto fermita ?"
 
-#: LYMessages.c:790
+#: LYMessages.c:815
 msgid "Cannot open temporary file for news POST."
 msgstr "Ne eblas malfermi provizoran dosieron por novaĵgrupa afiŝo."
 
-#: LYMessages.c:791
+#: LYMessages.c:816
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Ĉi tiu kliento ne regas afiŝi al novaĵgrupaj serviloj kun SSL."
 
 #. HTStyle.c
-#: LYMessages.c:794
+#: LYMessages.c:819
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Silo %d '%s' SGML:%s. Tiparo %s %.lf punktoj.\n"
 
-#: LYMessages.c:796
+#: LYMessages.c:821
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tAlign=%d, %d taboj. (%.0f antaŭe, %.0f poste)\n"
 
-#: LYMessages.c:797
+#: LYMessages.c:822
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tTabspeco=%d je %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:800
+#: LYMessages.c:825
 msgid "Can't proceed without a username and password."
 msgstr "Ne eblas daŭri sen salutnomo kaj pasvorto."
 
-#: LYMessages.c:801
+#: LYMessages.c:826
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Ne eblas reprovi kun atestado! Kontakti la TTT-ejo-estron."
 
-#: LYMessages.c:802
+#: LYMessages.c:827
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Ne eblas reprovi kun prokurila atestado! Kontakti la TTT-ejo-estron."
 
-#: LYMessages.c:803
+#: LYMessages.c:828
 msgid "Retrying with proxy authorization information."
 msgstr "Reprovanta kun informoj pri prokurila atestado."
 
-#: LYMessages.c:804
+#: LYMessages.c:829
 #, c-format
 msgid "SSL error:%s-Continue?"
-msgstr "SSL-eraro:%s- Daŭri?"
+msgstr "SSL-eraro:%s-Ĉu daŭrigi?"
 
 #. HTWAIS.c
-#: LYMessages.c:807
+#: LYMessages.c:832
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Responda mesaĝo tro granda."
 
-#: LYMessages.c:808
+#: LYMessages.c:833
 msgid "Enter WAIS query: "
 msgstr "Enmetu WAIS-mendon: "
 
 #. Miscellaneous status
-#: LYMessages.c:811
+#: LYMessages.c:836
 msgid "Retrying as HTTP0 request."
-msgstr "Reprovantan kiel HTTP0-peton."
+msgstr "Reprovanta kiel HTTP0-peton."
 
-#: LYMessages.c:812
+#: LYMessages.c:837
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "Transigis %d bajtojn"
 
-#: LYMessages.c:813
+#: LYMessages.c:838
 msgid "Data transfer complete"
 msgstr "Datumo-transigo kompleta"
 
-#: LYMessages.c:814
+#: LYMessages.c:839
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Eraro traktanta linion %d de %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:817
+#: LYMessages.c:842
 msgid "Address List Page"
 msgstr "Adreslista paĝo"
 
-#: LYMessages.c:818
+#: LYMessages.c:843
 msgid "Bookmark file"
 msgstr "Legosigna dosiero"
 
-#: LYMessages.c:819
+#: LYMessages.c:844
 msgid "Configuration Definitions"
 msgstr "Agordaj difinoj"
 
-#: LYMessages.c:820
+#: LYMessages.c:845
 msgid "Cookie Jar"
 msgstr "Kuketo-skatolo"
 
-#: LYMessages.c:821
+#: LYMessages.c:846
+msgid "Current Edit-Key Map"
+msgstr "Nuna redaktoklavomapo"
+
+#: LYMessages.c:847
 msgid "Current Key Map"
 msgstr "Nuna klavomapo"
 
-#: LYMessages.c:822
+#: LYMessages.c:848
 msgid "File Management Options"
 msgstr "Dosieradministradaj agordaĵoj"
 
-#: LYMessages.c:823
+#: LYMessages.c:849
 msgid "Download Options"
 msgstr "Elŝutaj agordaĵoj"
 
-#: LYMessages.c:824
+#: LYMessages.c:850
 msgid "History Page"
 msgstr "Historio-paĝo"
 
-#: LYMessages.c:825
+#: LYMessages.c:851
 msgid "Cache Jar"
 msgstr "Tenejo-skatolo"
 
-#: LYMessages.c:826
+#: LYMessages.c:852
 msgid "List Page"
 msgstr "Lista paĝo"
 
-#: LYMessages.c:827
+#: LYMessages.c:853
 msgid "Lynx.cfg Information"
 msgstr "Lynk.cfg-informoj"
 
-#: LYMessages.c:828
+#: LYMessages.c:854
 msgid "Converted Mosaic Hotlist"
 msgstr "Konvertis legosignojn de Mosaic"
 
-#: LYMessages.c:829
+#: LYMessages.c:855
 msgid "Options Menu"
 msgstr "Menuo pri agordaĵoj"
 
-#: LYMessages.c:830
+#: LYMessages.c:856
 msgid "File Permission Options"
 msgstr "Dosieratingaj agordaĵoj"
 
-#: LYMessages.c:831
+#: LYMessages.c:857
 msgid "Printing Options"
 msgstr "Printaj agordaĵoj"
 
-#: LYMessages.c:832
+#: LYMessages.c:858
 msgid "Information about the current document"
 msgstr "Informoj pri la nuna dokumento"
 
-#: LYMessages.c:833
+#: LYMessages.c:859
 msgid "Your recent statusline messages"
 msgstr "Freŝaj statliniaj mesaĝoj"
 
-#: LYMessages.c:834
+#: LYMessages.c:860
 msgid "Upload Options"
 msgstr "Alŝutaj agordaĵoj"
 
-#: LYMessages.c:835
+#: LYMessages.c:861
 msgid "Visited Links Page"
 msgstr "Paĝo pri vizititaj ligiloj"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:838
+#: LYMessages.c:864
 msgid "See also"
 msgstr "Ankaŭ vidu"
 
-#: LYMessages.c:839
+#: LYMessages.c:865
 msgid "your"
 msgstr "vian"
 
-#: LYMessages.c:840
+#: LYMessages.c:866
 msgid "for runtime options"
 msgstr "por plenumaj agordaĵoj"
 
-#: LYMessages.c:841
+#: LYMessages.c:867
 msgid "compile time options"
 msgstr "tradukantaj agordaĵoj"
 
-#: LYMessages.c:842
+#: LYMessages.c:868
 msgid "color-style configuration"
 msgstr "kolorstilaj agordaĵoj"
 
-#: LYMessages.c:843
+#: LYMessages.c:869
 msgid "latest release"
 msgstr "plej freŝa eldono"
 
-#: LYMessages.c:844
+#: LYMessages.c:870
 msgid "pre-release version"
 msgstr "beta eldono"
 
-#: LYMessages.c:845
+#: LYMessages.c:871
 msgid "development version"
 msgstr "alfa eldono"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:847
+#: LYMessages.c:873
 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"
 "of this page."
 msgstr ""
 "La sekvaj datumoj estis derivitaj dum la aŭtomata muntada procezo\n"
-"de ĉi tiu ekzemplero de Linko. Dum raportado de eraro, bonvolu inkluzivi ekzempleron\n"
+"de ĉi tiu ekzemplero de Lynx. Dum raportado de eraro, bonvolu inkluzivi ekzempleron\n"
 "de ĉi tiu paĝo."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:851
+#: LYMessages.c:877
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
 msgstr ""
 "La sekvaj datumoj estis uzataj kiel difinoj dum tradukado\n"
-"de Linko."
+"de Lynx."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:856
+#: LYMessages.c:882
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "  C) Krei D) Elŝuti E) Redakti F) Plena menuo M)odifi R) Forigi T) Marki U) Alŝuti\n"
 
-#: LYMessages.c:857
+#: LYMessages.c:883
 msgid "Failed to obtain status of current link!"
 msgstr "Malsukcesis atingi staton de nuna ligilo!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:860
+#: LYMessages.c:886
 msgid "Special URL only valid from current File Permission menu!"
-msgstr "Speciala retadreso nur validas el menuo pri atingopermesoj!"
+msgstr "Speciala URL nur validas el menuo pri atingopermesoj!"
 
-#: LYMessages.c:864
+#: LYMessages.c:890
 msgid "External support is currently disabled."
-msgstr "Ekstera subteno estas aktuale malebligita."
+msgstr "Ekstera subteno estas nune malaktivigita."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:868
+#: LYMessages.c:894
 msgid "Changing working-directory is currently disabled."
-msgstr "Ŝanĝi labordosierujon aktuale estas malebligita."
+msgstr "Ŝanĝi labordosierujon nune estas malaktivigita."
 
-#: LYMessages.c:869
+#: LYMessages.c:895
 msgid "Linewrap OFF!"
 msgstr "Linifaldo MALŜALTITA!"
 
-#: LYMessages.c:870
+#: LYMessages.c:896
 msgid "Linewrap ON!"
 msgstr "Linifaldo ŜALTITA!"
 
-#: LYMessages.c:871
+#: LYMessages.c:897
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Interpretanta nestintajn tabelojn MALŜALTITA! Reŝarganta..."
 
-#: LYMessages.c:872
+#: LYMessages.c:898
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Interpretanta nestintajn tabelojn ŜALTITA! Reŝarganta..."
 
-#: LYMessages.c:873
+#: LYMessages.c:899
 msgid "Shifting is disabled while line-wrap is in effect"
-msgstr "Tio estas malebligita dum linifaldado."
+msgstr "Tio estas malaktivigita dum linifaldado."
 
-#: LYMessages.c:874
+#: LYMessages.c:900
 msgid "Trace not supported"
 msgstr "Spurado ne komprenita"
 
-#: LYMessages.c:795
+#: LYMessages.c:820
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tDeŝovoj: ununaj=%.0f aliaj=%.0f, Alto=%.lf Pri=%.lf\n"
@@ -2804,12 +2876,12 @@ msgstr "Ĉi tiu kliento ne scias kiel komponi prokurilajn atesto-informojn por s
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Ĉi tiu kliento ne scias kiel komponi atesto-informojn por skemo"
 
-#: WWW/Library/Implementation/HTAABrow.c:1093
+#: WWW/Library/Implementation/HTAABrow.c:1094
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Nevalida kapo '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1198
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Prokurila atestado bezonita -- reprovanta"
 
@@ -2825,25 +2897,25 @@ msgstr "Atingo malpermesita laŭ regulo"
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Dokumento kun kaŝita enhavo ne trovita en tenejo. Resendi?"
 
-#: WWW/Library/Implementation/HTAccess.c:949
+#: WWW/Library/Implementation/HTAccess.c:947
 msgid "Loading failed, use a previous copy."
 msgstr "Ŝargo malsukcesis, uzu antaŭan ekzempleron."
 
-#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8867
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
 msgid "Loading incomplete."
 msgstr "Ŝargo nekompleta."
 
-#: WWW/Library/Implementation/HTAccess.c:1089
+#: WWW/Library/Implementation/HTAccess.c:1087
 #, c-format
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: konektingo aŭ dosiernomo returnita de malaktuala ŝargo-funkcio!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1091
+#: WWW/Library/Implementation/HTAccess.c:1089
 #, c-format
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev at nongnu.org!\n"
 msgstr "**** HTAccess: Interna programa eraro. Bonvolu sendi retleteron al lynx-dev at nongnu.org!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1092
+#: WWW/Library/Implementation/HTAccess.c:1090
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Statuso returnita estis: %d\n"
@@ -2852,65 +2924,65 @@ msgstr "**** HTAccess: Statuso returnita estis: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1098 src/LYMainLoop.c:8050
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
 msgid "Can't Access"
 msgstr "Ne eblas atingi"
 
-#: WWW/Library/Implementation/HTAccess.c:1106
+#: WWW/Library/Implementation/HTAccess.c:1104
 msgid "Unable to access document."
 msgstr "Ne eblas atingi dokumenton."
 
-#: WWW/Library/Implementation/HTFTP.c:849
+#: WWW/Library/Implementation/HTFTP.c:875
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Enmetu pasvorton por uzanto %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:877
+#: WWW/Library/Implementation/HTFTP.c:903
 msgid "Unable to connect to FTP host."
 msgstr "Ne eblas konektiĝi al FTP-retnodo."
 
-#: WWW/Library/Implementation/HTFTP.c:1158
+#: WWW/Library/Implementation/HTFTP.c:1142
 msgid "close master socket"
 msgstr "fermu estran konektingon"
 
-#: WWW/Library/Implementation/HTFTP.c:1220
+#: WWW/Library/Implementation/HTFTP.c:1204
 msgid "socket for master socket"
 msgstr "konektingo por estra konektingo"
 
-#: WWW/Library/Implementation/HTFTP.c:2986
+#: WWW/Library/Implementation/HTFTP.c:2952
 msgid "Receiving FTP directory."
 msgstr "Ricevanta FTP-dosierujon."
 
-#: WWW/Library/Implementation/HTFTP.c:3122
+#: WWW/Library/Implementation/HTFTP.c:3090
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Transigis %d bajtojn (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3480
+#: WWW/Library/Implementation/HTFTP.c:3448
 msgid "connect for data"
 msgstr "konekti por datumoj"
 
-#: WWW/Library/Implementation/HTFTP.c:4141
+#: WWW/Library/Implementation/HTFTP.c:4120
 msgid "Receiving FTP file."
 msgstr "Ricevanta FTP-dosieron."
 
-#: WWW/Library/Implementation/HTFinger.c:278
+#: WWW/Library/Implementation/HTFinger.c:274
 msgid "Could not set up finger connection."
 msgstr "Ne povis atingi finger-konekton."
 
-#: WWW/Library/Implementation/HTFinger.c:325
+#: WWW/Library/Implementation/HTFinger.c:321
 msgid "Could not load data (no sitename in finger URL)"
-msgstr "Ne povis ŝargi datumojn (neniu retnodonomo en finger-retadreso)"
+msgstr "Ne povis ŝargi datumojn (neniu retnodonomo en finger-URL)"
 
-#: WWW/Library/Implementation/HTFinger.c:329
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Invalid port number - will only use port 79!"
 msgstr "Nevalida pordo-numero - sole uzos pordo 79!"
 
-#: WWW/Library/Implementation/HTFinger.c:395
+#: WWW/Library/Implementation/HTFinger.c:391
 msgid "Could not access finger host."
 msgstr "Ne povis atingi finger-retnodon."
 
-#: WWW/Library/Implementation/HTFinger.c:403
+#: WWW/Library/Implementation/HTFinger.c:399
 msgid "No response from finger server."
 msgstr "Neniu respondo de finger-servilo."
 
@@ -2982,7 +3054,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTNews.c:1880
 msgid "All available articles in "
-msgstr "Ĉiuj haveblaj artikoloj en "
+msgstr "Ĉiuj disponeblaj artikoloj en "
 
 #: WWW/Library/Implementation/HTNews.c:2094
 msgid "Later articles"
@@ -2994,7 +3066,7 @@ msgstr "Afiŝi al "
 
 #: WWW/Library/Implementation/HTNews.c:2338
 msgid "This client does not contain support for SNEWS URLs."
-msgstr "Ĉi tiu kliento ne enhavas regon por SNEWS-retadresoj."
+msgstr "Ĉi tiu kliento ne enhavas regon por URL-oj de SNEWS."
 
 #: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
@@ -3024,7 +3096,7 @@ msgstr "Ne eblas legi informojn. Vaka respondo de retnodo %s"
 #.
 #: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of available newsgroups."
-msgstr "Leganta liston de haveblaj novaĵgrupoj."
+msgstr "Leganta liston de disponeblaj novaĵgrupoj."
 
 #: WWW/Library/Implementation/HTNews.c:2962
 msgid "Reading list of articles in newsgroup."
@@ -3041,16 +3113,16 @@ msgstr "Leganta novaĵgrupan artiklon."
 msgid "Sorry, could not load requested news."
 msgstr "Bedaŭrinde ne povis ŝarĝi la peton."
 
-#: WWW/Library/Implementation/HTTCP.c:1286
+#: WWW/Library/Implementation/HTTCP.c:1323
 msgid "Address has invalid port"
-msgstr "Retadreso havas nevalidan pordon"
+msgstr "URL havas nevalidan pordon"
 
-#: WWW/Library/Implementation/HTTCP.c:1362
+#: WWW/Library/Implementation/HTTCP.c:1397
 msgid "Address length looks invalid"
-msgstr "Retadresa longo ŝajnas nevalida"
+msgstr "URL-longo ŝajnas nevalida"
 
-#: WWW/Library/Implementation/HTTCP.c:1622
-#: WWW/Library/Implementation/HTTCP.c:1640
+#: WWW/Library/Implementation/HTTCP.c:1845
+#: WWW/Library/Implementation/HTTCP.c:1863
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ne eblas loki foran retnodon %s."
@@ -3059,134 +3131,143 @@ msgstr "Ne eblas loki foran retnodon %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1637
+#: WWW/Library/Implementation/HTTCP.c:1860
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Nevalida retnodonomo %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1651
+#: WWW/Library/Implementation/HTTCP.c:1874
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Faranta konekto-tipon %s al %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1662
+#: WWW/Library/Implementation/HTTCP.c:1885
 msgid "socket failed."
 msgstr "konektingo malsukcesis."
 
-#: WWW/Library/Implementation/HTTCP.c:1676
+#: WWW/Library/Implementation/HTTCP.c:1899
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "konektingo malsukcesis: familio %d adreso %s pordo %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1700
+#: WWW/Library/Implementation/HTTCP.c:1923
 msgid "Could not make connection non-blocking."
 msgstr "Ne eblas fari konekton senbloka."
 
-#: WWW/Library/Implementation/HTTCP.c:1768
+#: WWW/Library/Implementation/HTTCP.c:1991
 msgid "Connection failed (too many retries)."
 msgstr "Konekto malsukcesis (tro da reprovoj.)"
 
-#: WWW/Library/Implementation/HTTCP.c:1955
+#: WWW/Library/Implementation/HTTCP.c:2180
 msgid "Could not restore socket to blocking."
 msgstr "Ne povis restarigi konektingon je bloka."
 
-#: WWW/Library/Implementation/HTTCP.c:2021
+#: WWW/Library/Implementation/HTTCP.c:2248
 msgid "Socket read failed (too many tries)."
 msgstr "Legado de konektingo malsukcesis (tro da provoj)."
 
-#: WWW/Library/Implementation/HTTP.c:81
+#: WWW/Library/Implementation/HTTP.c:136
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL-revoko: %s, prevarify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:432
+#: WWW/Library/Implementation/HTTP.c:516
 #, c-format
 msgid "Address contains a username: %s"
-msgstr "Retadreso enhavas salutnomon: %s"
+msgstr "URL enhavas salutnomon: %s"
 
-#: WWW/Library/Implementation/HTTP.c:486
+#: WWW/Library/Implementation/HTTP.c:570
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Atestilo eldonita de %s"
 
-#: WWW/Library/Implementation/HTTP.c:673
+#: WWW/Library/Implementation/HTTP.c:757
 msgid "This client does not contain support for HTTPS URLs."
-msgstr "Ĉi tiu kliento ne enhavas regon por HTTPS-retadresoj."
+msgstr "Ĉi tiu kliento ne enhavas regon por URL-oj de HTTPS."
 
-#: WWW/Library/Implementation/HTTP.c:698
+#: WWW/Library/Implementation/HTTP.c:782
 msgid "Unable to connect to remote host."
 msgstr "Ne eblas konektiĝi al fora retnodo."
 
-#: WWW/Library/Implementation/HTTP.c:730
+#: WWW/Library/Implementation/HTTP.c:825
 msgid "Retrying connection without TLS."
 msgstr "Reprovanta konekton sen TLS."
 
-#: WWW/Library/Implementation/HTTP.c:773
+#: WWW/Library/Implementation/HTTP.c:877
+msgid "GnuTLS error when trying to verify certificate."
+msgstr "GNUTLS-eraro dum provi kontroli atestilon."
+
+#: WWW/Library/Implementation/HTTP.c:889
+msgid "the certificate has no known issuer"
+msgstr "la atestilo havas neniun konatan eldoninton"
+
+#: WWW/Library/Implementation/HTTP.c:891
 msgid "no issuer was found"
 msgstr "neniu eldoninto troviĝis"
 
-#: WWW/Library/Implementation/HTTP.c:775
+#: WWW/Library/Implementation/HTTP.c:893
 msgid "issuer is not a CA"
 msgstr "eldoninto ne oficiala"
 
-#: WWW/Library/Implementation/HTTP.c:777
-msgid "the certificate has no known issuer"
-msgstr "la atestilo havas neniun konatan eldoninton"
-
-#: WWW/Library/Implementation/HTTP.c:779
+#: WWW/Library/Implementation/HTTP.c:895
 msgid "the certificate has been revoked"
 msgstr "la atestilo estas forprenita"
 
-#: WWW/Library/Implementation/HTTP.c:781
+#: WWW/Library/Implementation/HTTP.c:897
 msgid "the certificate is not trusted"
 msgstr "la atestilo ne estas fidinda"
 
-#: WWW/Library/Implementation/HTTP.c:855
+#: WWW/Library/Implementation/HTTP.c:972
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
-msgstr "Konstatita konekto al %s (cert=%s)"
+msgstr "Kontrolita konekto al %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:903 WWW/Library/Implementation/HTTP.c:945
+#: WWW/Library/Implementation/HTTP.c:1022
+#: WWW/Library/Implementation/HTTP.c:1064
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
-msgstr "Konstatita konekto al %s (subj=%s)"
+msgstr "Kontrolita konekto al %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:975
+#: WWW/Library/Implementation/HTTP.c:1094
 msgid "Can't find common name in certificate"
 msgstr "Ne eblas trovi komunan nomon en atestilo"
 
-#: WWW/Library/Implementation/HTTP.c:978
+#: WWW/Library/Implementation/HTTP.c:1097
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
-msgstr "SSL eraro:retnodo(%s)!=cert(%s)-Ĉu daŭri?"
+msgstr "SSL-eraro:retnodo(%s)!=cert(%s)-Ĉu daŭri?"
 
-#: WWW/Library/Implementation/HTTP.c:991
+#: WWW/Library/Implementation/HTTP.c:1104
+msgid "SSL error"
+msgstr "SSL-eraro"
+
+#: WWW/Library/Implementation/HTTP.c:1112
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
-msgstr "NEKONSTATITA konekto al %s (cert=%s)"
+msgstr "NEKONTROLITA konekto al %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1000
+#: WWW/Library/Implementation/HTTP.c:1121
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Sekura %d-bita HTTP-konekto de %s (%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1467
+#: WWW/Library/Implementation/HTTP.c:1584
 msgid "Sending HTTP request."
 msgstr "Sendante HTTP-peton."
 
-#: WWW/Library/Implementation/HTTP.c:1509
+#: WWW/Library/Implementation/HTTP.c:1626
 msgid "Unexpected network write error; connection aborted."
-msgstr "Neanticipita reta skriberaro; konekto ĉesigita."
+msgstr "Neatendita reta skriberaro; konekto ĉesigita."
 
-#: WWW/Library/Implementation/HTTP.c:1515
+#: WWW/Library/Implementation/HTTP.c:1632
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-peto sendita; atendanta respondon."
 
-#: WWW/Library/Implementation/HTTP.c:1588
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1705
+#: WWW/Library/Implementation/HTTP.c:1715
 msgid "Unexpected network read error; connection aborted."
-msgstr "Neanticipita reta legeraro; konekto ĉesigita."
+msgstr "Neatendita reta legeraro; konekto ĉesigita."
 
 #.
 #. * HTTP/1.1 Informational statuses.
@@ -3197,9 +3278,9 @@ msgstr "Neanticipita reta legeraro; konekto ĉesigita."
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1800
+#: WWW/Library/Implementation/HTTP.c:1917
 msgid "Got unexpected Informational Status."
-msgstr "Ricevis neanticipitan informan staton."
+msgstr "Ricevis neatenditan informan staton."
 
 #.
 #. * Reset Content.  The server has fulfilled the request but
@@ -3207,7 +3288,7 @@ msgstr "Ricevis neanticipitan informan staton."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1834
+#: WWW/Library/Implementation/HTTP.c:1951
 msgid "Request fulfilled.  Reset Content."
 msgstr "Peto plenumita. Enhavo restarigita."
 
@@ -3217,27 +3298,27 @@ msgstr "Peto plenumita. Enhavo restarigita."
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1949
+#: WWW/Library/Implementation/HTTP.c:2066
 msgid "Got unexpected 304 Not Modified status."
-msgstr "Ricevis neanticipitan staton 304 Ne Modifita"
+msgstr "Ricevis neatenditan staton 304 Ne Modifita"
 
-#: WWW/Library/Implementation/HTTP.c:2012
+#: WWW/Library/Implementation/HTTP.c:2129
 msgid "Redirection of POST content requires user approval."
 msgstr "Alidirektado de kaŝita enhavo bezonas aprobon de uzanto."
 
-#: WWW/Library/Implementation/HTTP.c:2027
+#: WWW/Library/Implementation/HTTP.c:2144
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Havi kaŝitan enhavon. Traktanta ĉiaman alidirekton kiel provizoran.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2071
+#: WWW/Library/Implementation/HTTP.c:2188
 msgid "Retrying with access authorization information."
 msgstr "Reprovante kun atingo-atestadaj informoj."
 
-#: WWW/Library/Implementation/HTTP.c:2083
+#: WWW/Library/Implementation/HTTP.c:2200
 msgid "Show the 401 message body?"
 msgstr "Ĉu montri la mesaĝan korpon?"
 
-#: WWW/Library/Implementation/HTTP.c:2127
+#: WWW/Library/Implementation/HTTP.c:2244
 msgid "Show the 407 message body?"
 msgstr "Ĉu montri la mesaĝan korpon?"
 
@@ -3245,7 +3326,7 @@ msgstr "Ĉu montri la mesaĝan korpon?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2227
+#: WWW/Library/Implementation/HTTP.c:2344
 msgid "Unknown status reply from server!"
 msgstr "Nekonata stata respondo el servilo!"
 
@@ -3266,36 +3347,36 @@ msgstr "Ne eblas malfermi WAIS-konekton por legi."
 msgid "Diagnostic code is "
 msgstr "Diagnoza kodo estas "
 
-#: WWW/Library/Implementation/HTWAIS.c:464
+#: WWW/Library/Implementation/HTWAIS.c:460
 msgid "Index "
 msgstr "Indekso "
 
-#: WWW/Library/Implementation/HTWAIS.c:468
+#: WWW/Library/Implementation/HTWAIS.c:464
 #, c-format
 msgid " contains the following %d item%s relevant to \""
 msgstr " enhavas la jenajn %d erojn (%s) laŭtema al \""
 
-#: WWW/Library/Implementation/HTWAIS.c:476
+#: WWW/Library/Implementation/HTWAIS.c:472
 msgid "The first figure after each entry is its relative score, "
 msgstr "La unua figuraĵo post ĉiu ero estas ĝia relativa totalo, "
 
-#: WWW/Library/Implementation/HTWAIS.c:477
+#: WWW/Library/Implementation/HTWAIS.c:473
 msgid "the second is the number of lines in the item."
 msgstr "la dua estas la nombro da linioj en la ero."
 
-#: WWW/Library/Implementation/HTWAIS.c:519
+#: WWW/Library/Implementation/HTWAIS.c:515
 msgid " (bad file name)"
 msgstr " (fuŝa dosiernomo)"
 
-#: WWW/Library/Implementation/HTWAIS.c:545
+#: WWW/Library/Implementation/HTWAIS.c:541
 msgid "(bad doc id)"
 msgstr "(fuŝa identigilo"
 
-#: WWW/Library/Implementation/HTWAIS.c:561
+#: WWW/Library/Implementation/HTWAIS.c:557
 msgid "(Short Header record, can't display)"
 msgstr "(Mallonga kapa rikordo, ne eblas montri)"
 
-#: WWW/Library/Implementation/HTWAIS.c:568
+#: WWW/Library/Implementation/HTWAIS.c:564
 msgid ""
 "\n"
 "Long Header record, can't display\n"
@@ -3303,7 +3384,7 @@ msgstr ""
 "\n"
 "Longa kapa rikordo, ne eblas montri\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:575
+#: WWW/Library/Implementation/HTWAIS.c:571
 msgid ""
 "\n"
 "Text record\n"
@@ -3311,7 +3392,7 @@ msgstr ""
 "\n"
 "Teksta rikordo\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:584
+#: WWW/Library/Implementation/HTWAIS.c:580
 msgid ""
 "\n"
 "Headline record, can't display\n"
@@ -3319,7 +3400,7 @@ msgstr ""
 "\n"
 "Rubrika rikordo, ne eblas montri\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:592
+#: WWW/Library/Implementation/HTWAIS.c:588
 msgid ""
 "\n"
 "Code record, can't display\n"
@@ -3327,27 +3408,27 @@ msgstr ""
 "\n"
 "Koda rikordo, ne eblas montri\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:696
+#: WWW/Library/Implementation/HTWAIS.c:692
 msgid "Syntax error in WAIS URL"
-msgstr "Sintaksa eraro en WAIS-retadreso"
+msgstr "Sintaksa eraro en WAIS-URL"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:764
 msgid " (WAIS Index)"
 msgstr " (WAIS-Indekso)"
 
-#: WWW/Library/Implementation/HTWAIS.c:775
+#: WWW/Library/Implementation/HTWAIS.c:771
 msgid "WAIS Index: "
 msgstr "WAIS-Indekso: "
 
-#: WWW/Library/Implementation/HTWAIS.c:781
+#: WWW/Library/Implementation/HTWAIS.c:777
 msgid "This is a link for searching the "
 msgstr "Ĉi tio estas ligilo por serĉi la "
 
-#: WWW/Library/Implementation/HTWAIS.c:785
+#: WWW/Library/Implementation/HTWAIS.c:781
 msgid " WAIS Index.\n"
 msgstr " WAIS-indekson.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:814
+#: WWW/Library/Implementation/HTWAIS.c:810
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3355,188 +3436,188 @@ msgstr ""
 "\n"
 "Enmutu la 's'erĉan komandon kaj tiam specifu serĉajn vortojn.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:832
 msgid " (in "
 msgstr " (en "
 
-#: WWW/Library/Implementation/HTWAIS.c:845
+#: WWW/Library/Implementation/HTWAIS.c:841
 msgid "WAIS Search of \""
 msgstr "WAIS-serĉo de \""
 
-#: WWW/Library/Implementation/HTWAIS.c:849
+#: WWW/Library/Implementation/HTWAIS.c:845
 msgid "\" in: "
 msgstr "\" en: "
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:860
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Petro tro granda."
 
-#: WWW/Library/Implementation/HTWAIS.c:873
+#: WWW/Library/Implementation/HTWAIS.c:869
 msgid "Searching WAIS database..."
 msgstr "Serĉanta WAIS-datumbazon..."
 
-#: WWW/Library/Implementation/HTWAIS.c:883
+#: WWW/Library/Implementation/HTWAIS.c:879
 msgid "Search interrupted."
 msgstr "Serĉo interrompita."
 
-#: WWW/Library/Implementation/HTWAIS.c:934
+#: WWW/Library/Implementation/HTWAIS.c:930
 msgid "Can't convert format of WAIS document"
 msgstr "Ne eblas konverti formaton de WAIS-dokumento"
 
-#: WWW/Library/Implementation/HTWAIS.c:978
+#: WWW/Library/Implementation/HTWAIS.c:974
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Peto tro longa."
 
 #.
 #. * Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:992
+#: WWW/Library/Implementation/HTWAIS.c:988
 msgid "Fetching WAIS document..."
 msgstr "Atinganta WAIS-dokumenton..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1031
+#: WWW/Library/Implementation/HTWAIS.c:1027
 msgid "No text was returned!\n"
 msgstr "Neniu teksto estis redonita!\n"
 
-#: WWW/Library/Implementation/HTWSRC.c:301
+#: WWW/Library/Implementation/HTWSRC.c:302
 msgid " NOT GIVEN in source file; "
 msgstr " NE DONITA en fontoteksta dosiero; "
 
-#: WWW/Library/Implementation/HTWSRC.c:324
+#: WWW/Library/Implementation/HTWSRC.c:325
 msgid " WAIS source file"
 msgstr "WAIS-a fontoteksta dosiero"
 
-#: WWW/Library/Implementation/HTWSRC.c:331
+#: WWW/Library/Implementation/HTWSRC.c:332
 msgid " description"
 msgstr " priskribo"
 
-#: WWW/Library/Implementation/HTWSRC.c:341
+#: WWW/Library/Implementation/HTWSRC.c:342
 msgid "Access links"
 msgstr "Atingaj ligiloj"
 
-#: WWW/Library/Implementation/HTWSRC.c:362
+#: WWW/Library/Implementation/HTWSRC.c:363
 msgid "Direct access"
 msgstr "Rekta atingo"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:365
+#: WWW/Library/Implementation/HTWSRC.c:366
 msgid " (or via proxy server, if defined)"
 msgstr " (aŭ per prokurilo, se difinita)"
 
-#: WWW/Library/Implementation/HTWSRC.c:380
+#: WWW/Library/Implementation/HTWSRC.c:381
 msgid "Maintainer"
 msgstr "Prizorganto"
 
-#: WWW/Library/Implementation/HTWSRC.c:388
+#: WWW/Library/Implementation/HTWSRC.c:389
 msgid "Host"
 msgstr "Gastiganto"
 
-#: src/GridText.c:699
+#: src/GridText.c:691
 msgid "Memory exhausted, display interrupted!"
 msgstr "Maltro da memoro, montrado interrompita!"
 
-#: src/GridText.c:704
+#: src/GridText.c:696
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Maltro da memoro, interrompos transigon!"
 
-#: src/GridText.c:3685
+#: src/GridText.c:3674
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** MALTRO DA MEMORO ***"
 
-#: src/GridText.c:6146
+#: src/GridText.c:6152
 msgid "text entry field"
 msgstr "teksta kampo"
 
-#: src/GridText.c:6149
+#: src/GridText.c:6155
 msgid "password entry field"
 msgstr "pasvorta kampo"
 
-#: src/GridText.c:6152
+#: src/GridText.c:6158
 msgid "checkbox"
 msgstr "markobutono"
 
-#: src/GridText.c:6155
+#: src/GridText.c:6161
 msgid "radio button"
 msgstr "radiobutono"
 
-#: src/GridText.c:6158
+#: src/GridText.c:6164
 msgid "submit button"
 msgstr "sendobutono"
 
-#: src/GridText.c:6161
+#: src/GridText.c:6167
 msgid "reset button"
 msgstr "restarigobutono"
 
-#: src/GridText.c:6164
+#: src/GridText.c:6170
 msgid "script button"
 msgstr "skripta butono"
 
-#: src/GridText.c:6167
+#: src/GridText.c:6173
 msgid "popup menu"
 msgstr "ŝprucmenuo"
 
-#: src/GridText.c:6170
+#: src/GridText.c:6176
 msgid "hidden form field"
 msgstr "kaŝita kampo"
 
-#: src/GridText.c:6173
+#: src/GridText.c:6179
 msgid "text entry area"
 msgstr "tekstregiono"
 
-#: src/GridText.c:6176
+#: src/GridText.c:6182
 msgid "range entry field"
 msgstr "gama kampo"
 
-#: src/GridText.c:6179
+#: src/GridText.c:6185
 msgid "file entry field"
 msgstr "dosiera kampo"
 
-#: src/GridText.c:6182
+#: src/GridText.c:6188
 msgid "text-submit field"
 msgstr "teksta sendobutono"
 
-#: src/GridText.c:6185
+#: src/GridText.c:6191
 msgid "image-submit button"
 msgstr "bilda sendobutono"
 
-#: src/GridText.c:6188
+#: src/GridText.c:6194
 msgid "keygen field"
 msgstr "ŝlosila kampo"
 
-#: src/GridText.c:6191
+#: src/GridText.c:6197
 msgid "unknown form field"
 msgstr "nekonata kampo"
 
-#: src/GridText.c:6211 src/GridText.c:6218 src/LYList.c:248
+#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
 msgid "unknown field or link"
 msgstr "nekonata kampo aŭ ligilo"
 
-#: src/GridText.c:10649
+#: src/GridText.c:10650
 msgid "Can't open file for uploading"
 msgstr "Ne eblas malfermi dosieron por alŝuti"
 
-#: src/GridText.c:11837
+#: src/GridText.c:11843
 #, c-format
 msgid "Submitting %s"
 msgstr "Sendante je %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12894
+#: src/GridText.c:12919
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Eraro: rikordo TextAnchor fuŝita - proponas ĉesigi!"
 
 #. don't show previous state
-#: src/GridText.c:13056
+#: src/GridText.c:13083
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ĉu linifaldi por plenigi montritan regionon?"
 
-#: src/GridText.c:13696
+#: src/GridText.c:13719
 msgid "Very long lines have been truncated!"
 msgstr "Tre longaj linioj estis mallongigitaj!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:364 src/LYShowInfo.c:368
+#: src/HTAlert.c:164 src/LYShowInfo.c:386 src/LYShowInfo.c:390
 msgid "bytes"
 msgstr "bajtoj"
 
@@ -3544,32 +3625,32 @@ msgstr "bajtoj"
 #. * If we know the total size of the file, we can compute
 #. * a percentage, and show a corresponding progress bar.
 #.
-#: src/HTAlert.c:303 src/HTAlert.c:329
+#: src/HTAlert.c:328 src/HTAlert.c:354
 #, c-format
 msgid "Read %s of data"
 msgstr "Legita %s da datumo"
 
-#: src/HTAlert.c:326
+#: src/HTAlert.c:351
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Legita %s el %s da datumo"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:360
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s en sekundo"
 
-#: src/HTAlert.c:347
+#: src/HTAlert.c:374
 #, c-format
 msgid " (stalled for %s)"
 msgstr " (paŭzanta dum %s)"
 
-#: src/HTAlert.c:351
+#: src/HTAlert.c:378
 #, c-format
 msgid ", ETA %s"
 msgstr ", aproksimate je %s"
 
-#: src/HTAlert.c:373
+#: src/HTAlert.c:400
 msgid " (Press 'z' to abort)"
 msgstr " (Premu 'z' por ĉesigi)"
 
@@ -3598,11 +3679,11 @@ msgstr " (Premu 'z' por ĉesigi)"
 #. * Lynx will also accept y Y n N as responses unless there is a conflict
 #. * with the first letter of the "yes" or "no" translation.
 #.
-#: src/HTAlert.c:411 src/HTAlert.c:459
+#: src/HTAlert.c:438 src/HTAlert.c:486
 msgid "yes"
 msgstr "jes"
 
-#: src/HTAlert.c:414 src/HTAlert.c:460
+#: src/HTAlert.c:441 src/HTAlert.c:487
 msgid "no"
 msgstr "ne"
 
@@ -3622,35 +3703,35 @@ msgstr "ne"
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:913
+#: src/HTAlert.c:940
 msgid "Y/N/A/V"
 msgstr "J/N/A/E"
 
-#: src/HTML.c:5915
+#: src/HTML.c:5931
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: src/HTML.c:5920
+#: src/HTML.c:5936
 msgid "(none)"
 msgstr "(neniu)"
 
-#: src/HTML.c:5924
+#: src/HTML.c:5940
 msgid "Filepath:"
 msgstr "Dosiervojo:"
 
-#: src/HTML.c:5930
+#: src/HTML.c:5946
 msgid "(unknown)"
 msgstr "(nekonata)"
 
-#: src/HTML.c:7370
+#: src/HTML.c:7386
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokumento havas nur kaŝitajn ligilojn. Uzu la komandon 'l'istigi."
 
-#: src/HTML.c:7869
+#: src/HTML.c:7885
 msgid "Source cache error - disk full?"
 msgstr "Eraro ĉe fontoteksta tenejo - ĉu disko plenigita?"
 
-#: src/HTML.c:7882
+#: src/HTML.c:7898
 msgid "Source cache error - not enough memory!"
 msgstr "Eraro ĉe fontoteksta tenejo - ne sufiĉo da memoro"
 
@@ -3666,7 +3747,7 @@ msgstr ""
 "    komandon 'forigi legosignon'. Ordinare ĝi estas la klavo\n"
 "    'R', sed eble    vi aŭ via sistemestro ŝanĝis ĝin."
 
-#: src/LYBookmark.c:376
+#: src/LYBookmark.c:378
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3675,7 +3756,7 @@ msgstr ""
 "     Vi povas forigi ligilojn per la klavo 'R'<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:379
+#: src/LYBookmark.c:381
 msgid ""
 "     You can delete links using the remove bookmark command.  It is usually\n"
 "     the 'R' key but may have been remapped by you or your system\n"
@@ -3684,7 +3765,7 @@ msgstr ""
 "     Vi povas forigi ligilojn uzante la komandon 'forigi legosignon'. Ĝi ordinare\n"
 "     estas la klavo 'R', sed eble vi aŭ via sistemestro ŝanĝis ĝin."
 
-#: src/LYBookmark.c:383
+#: src/LYBookmark.c:385
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3692,7 +3773,7 @@ msgstr ""
 "     Oni povas ankaŭ redakti ĉi tiun dosieron per ordinara tekstoredaktilo por forigi\n"
 "     malaktualajn aŭ nevalidajn ligilojn aŭ por ŝanĝi ilian ordon."
 
-#: src/LYBookmark.c:386
+#: src/LYBookmark.c:388
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3709,7 +3790,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Dosiero eble ne restarigebla de %s dum ĉi tiu seanco"
 
-#: src/LYCgi.c:158
+#: src/LYCgi.c:162
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Ĉu vi volas plenumigi la programon \"%s\"?"
@@ -3718,71 +3799,75 @@ msgstr "Ĉu vi volas plenumigi la programon \"%s\"?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:273
+#: src/LYCgi.c:277
 msgid "Unable to access cgi script"
 msgstr "Ne eblas atingi CGI-programeton."
 
-#: src/LYCgi.c:707 src/LYCgi.c:710
+#: src/LYCgi.c:711 src/LYCgi.c:714
 msgid "Good Advice"
 msgstr "Bona konsilo"
 
-#: src/LYCgi.c:714
+#: src/LYCgi.c:718
 msgid "An excellent http server for VMS is available via"
 msgstr "Bonega HTTP-servilo por VMS disponeblas per"
 
-#: src/LYCgi.c:721
+#: src/LYCgi.c:725
 msgid "this link"
 msgstr "ĉi tiu ligilo"
 
-#: src/LYCgi.c:725
+#: src/LYCgi.c:729
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Ĝi havigas nevenkeblan regadon de CGI-programetoj.\n"
 
-#: src/LYClean.c:122
+#: src/LYClean.c:115
 msgid "Exiting via interrupt:"
 msgstr "Eliranta per interrompo:"
 
-#: src/LYCookie.c:2537
+#: src/LYCookie.c:2541
 msgid "(from a previous session)"
 msgstr "(el eksa seanco)"
 
-#: src/LYCookie.c:2598
+#: src/LYCookie.c:2602
 msgid "Maximum Gobble Date:"
 msgstr "(maksimuma voranta dato:"
 
-#: src/LYCookie.c:2637
+#: src/LYCookie.c:2641
 msgid "Internal"
 msgstr "Interna"
 
-#: src/LYCookie.c:2638
+#: src/LYCookie.c:2642
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "eraro cookie_domain_flag_set, eliranta programon"
 
-#: src/LYCurses.c:1297
+#: src/LYCurses.c:1170
+msgid "Terminal reinitialisation failed - unknown terminal type?"
+msgstr "Terminala restartigo malsukcesis - ĉu nekonata terminala tipo?"
+
+#: src/LYCurses.c:1377
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminala startigo malsukcesis - ĉu nekonata terminala tipo?"
 
-#: src/LYCurses.c:1780
+#: src/LYCurses.c:1863
 msgid "Terminal ="
 msgstr "Terminalo ="
 
-#: src/LYCurses.c:1784
+#: src/LYCurses.c:1867
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Vi devas uzi terminalon vt100, 200 ktp kun ĉi tiu programo."
 
-#: src/LYCurses.c:1833
+#: src/LYCurses.c:1916
 msgid "Your Terminal type is unknown!"
 msgstr "Via terminala tipo estas nekonata!"
 
-#: src/LYCurses.c:1834
+#: src/LYCurses.c:1917
 msgid "Enter a terminal type:"
 msgstr "Enmetu terminalan tipon:"
 
-#: src/LYCurses.c:1848
+#: src/LYCurses.c:1931
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINALA TIPO ESTAS AGORDITA AL"
 
-#: src/LYCurses.c:2398
+#: src/LYCurses.c:2483
 #, c-format
 msgid ""
 "\n"
@@ -3791,7 +3876,7 @@ msgstr ""
 "\n"
 "Paneanta eraro okazis en %s Eldono %s\n"
 
-#: src/LYCurses.c:2401
+#: src/LYCurses.c:2486
 #, c-format
 msgid ""
 "\n"
@@ -3804,7 +3889,7 @@ msgstr ""
 "\n"
 "Bonvolo sciigi vian sistemestron por konfirmi eraron, kaj se\n"
 "konfirmita, sciigi la dissendoliston lynx-dev. Eraraj raportoj havu koncizajn\n"
-"priskribojn de la komando kajaŭ retadreso, kio kaŭzis la problemon, la\n"
+"priskribojn de la komando kajaŭ URL, kio kaŭzis la problemon, la\n"
 "operaciuma nomo kaj eldonnumero, kaj aliaj koncernaj informoj.\n"
 
 #: src/LYEdit.c:272
@@ -3847,41 +3932,41 @@ msgstr "Vidi provizoran dosieron"
 
 #: src/LYDownload.c:557
 msgid "Save to disk disabled."
-msgstr "Konservado al disko malebligita."
+msgstr "Konservado al disko malaktivigita."
 
-#: src/LYDownload.c:561 src/LYPrint.c:1322
+#: src/LYDownload.c:561 src/LYPrint.c:1330
 msgid "Local additions:"
 msgstr "Lokaj aldonoj:"
 
-#: src/LYDownload.c:572 src/LYUpload.c:209
+#: src/LYDownload.c:572 src/LYUpload.c:206
 msgid "No Name Given"
 msgstr "Neniu nomo donita"
 
-#: src/LYHistory.c:679
+#: src/LYHistory.c:680
 msgid "You selected:"
 msgstr "Vi elektis:"
 
-#: src/LYHistory.c:703 src/LYHistory.c:932
+#: src/LYHistory.c:704 src/LYHistory.c:933
 msgid "(no address)"
 msgstr "(neniu adreso)"
 
-#: src/LYHistory.c:707
+#: src/LYHistory.c:708
 msgid " (internal)"
 msgstr "(interna)"
 
-#: src/LYHistory.c:709
+#: src/LYHistory.c:710
 msgid " (was internal)"
 msgstr " (estis interna)"
 
-#: src/LYHistory.c:807
+#: src/LYHistory.c:808
 msgid " (From History)"
 msgstr "(El Historio)"
 
-#: src/LYHistory.c:852
+#: src/LYHistory.c:853
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Vi vizitis (kaŝaj petoj, legosigno, menuo kaj listoj ne estas inkluzivitaj):"
 
-#: src/LYHistory.c:1154
+#: src/LYHistory.c:1155
 msgid "(No messages yet)"
 msgstr "(Ankoraŭ neniuj mesaĝoj)"
 
@@ -3941,27 +4026,27 @@ msgstr "Totalaj okupadoj"
 msgid "Total frees"
 msgstr "Totalaj malokupadoj"
 
-#: src/LYList.c:88
+#: src/LYList.c:89
 msgid "References in "
 msgstr "Referencoj en "
 
-#: src/LYList.c:91
+#: src/LYList.c:92
 msgid "this document:"
 msgstr "ĉi tiu dokumento:"
 
-#: src/LYList.c:97
+#: src/LYList.c:98
 msgid "Visible links:"
 msgstr "Videblaj ligiloj:"
 
-#: src/LYList.c:201 src/LYList.c:312
+#: src/LYList.c:202 src/LYList.c:321
 msgid "Hidden links:"
 msgstr "Kaŝitaj ligiloj:"
 
-#: src/LYList.c:349
+#: src/LYList.c:358
 msgid "References"
 msgstr "Referencoj"
 
-#: src/LYList.c:353
+#: src/LYList.c:362
 msgid "Visible links"
 msgstr "Videblaj ligiloj"
 
@@ -3974,307 +4059,307 @@ msgstr "Ne eblas atingi staton de '%s'."
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "La elektita ero ne estas dosier(uj)o. Peto ignorita."
 
-#: src/LYLocal.c:455
+#: src/LYLocal.c:456
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Ne eblas fari %s pro sistemaj eraroj!"
 
-#: src/LYLocal.c:489
+#: src/LYLocal.c:490
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Probabla fiasko ĉe %s pro sistemaj eraroj!"
 
-#: src/LYLocal.c:554 src/LYLocal.c:577
+#: src/LYLocal.c:555 src/LYLocal.c:578
 #, c-format
 msgid "remove %s"
 msgstr "forigi je %s"
 
-#: src/LYLocal.c:597
+#: src/LYLocal.c:598
 #, c-format
 msgid "touch %s"
 msgstr "tuŝi je %s"
 
-#: src/LYLocal.c:627
+#: src/LYLocal.c:628
 #, c-format
 msgid "move %s to %s"
 msgstr "movi je %s al %s"
 
-#: src/LYLocal.c:675
+#: src/LYLocal.c:676
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Jam ekzistas dosierujo kun tiu nomo. Peto ignorita."
 
-#: src/LYLocal.c:677
+#: src/LYLocal.c:678
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Jam ekzistas dosiero kun tiu nomo! Peto ignorita"
 
-#: src/LYLocal.c:679
+#: src/LYLocal.c:680
 msgid "The specified name is already in use!  Request ignored."
 msgstr "La specifa nomo jam estas uzita! Peto ignorita."
 
-#: src/LYLocal.c:691
+#: src/LYLocal.c:692
 msgid "Destination has different owner!  Request denied."
 msgstr "Celo havas malsaman estron! Peto rifuzita."
 
-#: src/LYLocal.c:694
+#: src/LYLocal.c:695
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Celo ne estas valida dosierujo. Peto rifuzita."
 
-#: src/LYLocal.c:710
+#: src/LYLocal.c:711
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Fonto kaj celo estas la sama loko! Peto ignorita!"
 
-#: src/LYLocal.c:734
+#: src/LYLocal.c:735
 msgid "Remove all tagged files and directories?"
 msgstr "Ĉu forigi ĉiujn markitajn dosier(uj)ojn?"
 
-#: src/LYLocal.c:807
+#: src/LYLocal.c:808
 msgid "Enter new location for tagged items: "
 msgstr "Enmetu novan lokon por markitaj eroj: "
 
-#: src/LYLocal.c:905
+#: src/LYLocal.c:906
 msgid "Enter new name for directory: "
 msgstr "Enmetu nomon por nova dosierujo: "
 
-#: src/LYLocal.c:907
+#: src/LYLocal.c:908
 msgid "Enter new name for file: "
 msgstr "Enmetu novan nomon por dosiero: "
 
-#: src/LYLocal.c:919
+#: src/LYLocal.c:920
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Nevalida signo (voja apartigilo) trovita! Peto ignorita."
 
-#: src/LYLocal.c:969
+#: src/LYLocal.c:970
 msgid "Enter new location for directory: "
 msgstr "Enmetu novan lokon por dosierujo: "
 
-#: src/LYLocal.c:971
+#: src/LYLocal.c:972
 msgid "Enter new location for file: "
 msgstr "Enmetu novan lokon por dosiero: "
 
-#: src/LYLocal.c:998
+#: src/LYLocal.c:999
 msgid "Unexpected failure - unable to find trailing path separator"
-msgstr "Neanticipita fiasko - ne eblas trovi antaŭvojan apartigilon"
+msgstr "Neatendita fiasko - ne eblas trovi antaŭvojan apartigilon"
 
-#: src/LYLocal.c:1060
+#: src/LYLocal.c:1061
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modifi nomon, lokon aŭ permeson (n,l,p): "
 
-#: src/LYLocal.c:1062
+#: src/LYLocal.c:1063
 msgid "Modify name or location (n or l): "
 msgstr "Modifi nomon aŭ lokon (n aŭ l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1091
+#: src/LYLocal.c:1092
 msgid "This feature not yet implemented!"
 msgstr "Tiu trajto ne jam estas realigita!"
 
-#: src/LYLocal.c:1112
+#: src/LYLocal.c:1113
 msgid "Enter name of file to create: "
 msgstr "Enmetu nomon de dosiero por krei: "
 
-#: src/LYLocal.c:1115 src/LYLocal.c:1152
+#: src/LYLocal.c:1116 src/LYLocal.c:1153
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Nevalida alidirektado \"//\" trovita! Peto ignorita."
 
-#: src/LYLocal.c:1149
+#: src/LYLocal.c:1150
 msgid "Enter name for new directory: "
 msgstr "Enmetu nomon por nova dosierujo: "
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1191
 msgid "Create file or directory (f or d): "
 msgstr "Krei dosieron aŭ dosierujon (f aŭ d): "
 
-#: src/LYLocal.c:1232
+#: src/LYLocal.c:1233
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Ĉu forigi dosierujon '%s'?"
 
-#: src/LYLocal.c:1235
+#: src/LYLocal.c:1236
 msgid "Remove directory?"
 msgstr "Ĉu forigi dosierujon?"
 
-#: src/LYLocal.c:1240
+#: src/LYLocal.c:1241
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Ĉu forigi dosieron '%s'?"
 
-#: src/LYLocal.c:1242
+#: src/LYLocal.c:1243
 msgid "Remove file?"
 msgstr "Ĉu forigi dosieron?"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1248
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Ĉu forigi molan ligilon '%s'?"
 
-#: src/LYLocal.c:1249
+#: src/LYLocal.c:1250
 msgid "Remove symbolic link?"
 msgstr "Ĉu forigi molan ligilon?"
 
-#: src/LYLocal.c:1347
+#: src/LYLocal.c:1348
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Bedaŭrinde ne scias kiel permesi dosierojn ekster Unikso."
 
-#: src/LYLocal.c:1376
+#: src/LYLocal.c:1377
 msgid "Unable to open permit options file"
 msgstr "Ne eblas malfermi permesan dosieron"
 
-#: src/LYLocal.c:1404
+#: src/LYLocal.c:1405
 msgid "Specify permissions below:"
 msgstr "Specifi permesojn sube:"
 
-#: src/LYLocal.c:1405 src/LYShowInfo.c:265
+#: src/LYLocal.c:1406 src/LYShowInfo.c:287
 msgid "Owner:"
 msgstr "Estro:"
 
-#: src/LYLocal.c:1421
+#: src/LYLocal.c:1422
 msgid "Group"
 msgstr "Grupo"
 
-#: src/LYLocal.c:1437
+#: src/LYLocal.c:1438
 msgid "Others:"
 msgstr "Aliaj:"
 
-#: src/LYLocal.c:1455
+#: src/LYLocal.c:1456
 msgid "form to permit"
 msgstr "formularo por permesi:"
 
-#: src/LYLocal.c:1551
+#: src/LYLocal.c:1552
 msgid "Invalid mode format."
 msgstr "Nevalida reĝima formato."
 
-#: src/LYLocal.c:1555
+#: src/LYLocal.c:1556
 msgid "Invalid syntax format."
 msgstr "Nevalida sintaksa formato."
 
-#: src/LYLocal.c:1742
+#: src/LYLocal.c:1743
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
-msgstr "Averto! UUDecoded-dosiero ekzistos en la dosierujo en kiu vi plenumigis Linkon."
+msgstr "Averto! UUDecoded-dosiero ekzistos en la dosierujo en kiu vi plenumigis Lynx."
 
-#: src/LYLocal.c:1932
+#: src/LYLocal.c:1933
 msgid "NULL URL pointer"
-msgstr "Vaka retadresa montrilo"
+msgstr "Nula URL-montrilo"
 
-#: src/LYLocal.c:2014
+#: src/LYLocal.c:2015
 #, c-format
 msgid "Executing %s "
 msgstr "Plenumanta je %s "
 
-#: src/LYLocal.c:2017
+#: src/LYLocal.c:2018
 msgid "Executing system command. This might take a while."
 msgstr "Plenumanta sisteman komandon. Tio eble estos malrapida."
 
-#: src/LYLocal.c:2091
+#: src/LYLocal.c:2092
 msgid "Current directory:"
-msgstr "Aktuala dosierujo:"
+msgstr "Nuna dosierujo:"
 
-#: src/LYLocal.c:2094 src/LYLocal.c:2112
+#: src/LYLocal.c:2095 src/LYLocal.c:2113
 msgid "Current selection:"
-msgstr "Aktuala elekto:"
+msgstr "Nuna elekto:"
 
-#: src/LYLocal.c:2098
+#: src/LYLocal.c:2099
 msgid "Nothing currently selected."
 msgstr "Nenio nune elektita."
 
-#: src/LYLocal.c:2114
+#: src/LYLocal.c:2115
 msgid "tagged item:"
 msgstr "markita ero:"
 
-#: src/LYLocal.c:2115
+#: src/LYLocal.c:2116
 msgid "tagged items:"
 msgstr "markitaj eroj:"
 
-#: src/LYLocal.c:2215 src/LYLocal.c:2224
+#: src/LYLocal.c:2216 src/LYLocal.c:2225
 msgid "Illegal filename; request ignored."
 msgstr "Nevalida dosiernomo; peto ignorita."
 
 #. directory not writable
-#: src/LYLocal.c:2322 src/LYLocal.c:2381
+#: src/LYLocal.c:2323 src/LYLocal.c:2382
 msgid "Install in the selected directory not permitted."
 msgstr "Instali en la elektitan dosierujon ne estas permesita."
 
-#: src/LYLocal.c:2377
+#: src/LYLocal.c:2378
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "La elektita ero ne estas dosiero. Peto ignorita."
 
-#: src/LYLocal.c:2386
+#: src/LYLocal.c:2387
 msgid "Just a moment, ..."
 msgstr " Nur momento"
 
-#: src/LYLocal.c:2403
+#: src/LYLocal.c:2404
 msgid "Error building install args"
 msgstr "Eraro dum munti instalajn parametrojn"
 
-#: src/LYLocal.c:2418 src/LYLocal.c:2449
+#: src/LYLocal.c:2419 src/LYLocal.c:2450
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Fonto kaj celo estas samaj: %s"
 
-#: src/LYLocal.c:2425 src/LYLocal.c:2456
+#: src/LYLocal.c:2426 src/LYLocal.c:2457
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Jam en la cela dosierujo: %s"
 
-#: src/LYLocal.c:2474
+#: src/LYLocal.c:2475
 msgid "Installation complete"
 msgstr "Instalado kompleta"
 
-#: src/LYLocal.c:2666
+#: src/LYLocal.c:2680
 msgid "Temporary URL or list would be too long."
-msgstr "Provizora retadreso aŭ listo estus tro longa."
+msgstr "Provizora URL aŭ listo estus tro longa."
 
-#: src/LYMail.c:544
+#: src/LYMail.c:566
 msgid "Sending"
 msgstr "Sendante"
 
-#: src/LYMail.c:1030
+#: src/LYMail.c:1050
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "La ligilo %s :?: %s \n"
 
-#: src/LYMail.c:1032
+#: src/LYMail.c:1052
 #, c-format
 msgid "called \"%s\"\n"
 msgstr ""
 "vokita \"%s\n"
 "\n"
 
-#: src/LYMail.c:1033
+#: src/LYMail.c:1053
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "en la dosiero \"%s\" nomita \"%s\"\n"
 
-#: src/LYMail.c:1034
+#: src/LYMail.c:1054
 msgid "was requested but was not available."
-msgstr "estis petita sed ne havebla."
+msgstr "estis petita sed ne disponebla."
 
-#: src/LYMail.c:1035
+#: src/LYMail.c:1055
 msgid "Thought you might want to know."
 msgstr "Pensis, ke vi eble volus scii."
 
-#: src/LYMail.c:1037
+#: src/LYMail.c:1057
 msgid "This message was automatically generated by"
 msgstr "La mesaĝo estis aŭtomate generita per"
 
-#: src/LYMail.c:1751
+#: src/LYMail.c:1770
 msgid "No system mailer configured"
 msgstr "Neniu sistema retpoŝto-servilo agordita"
 
-#: src/LYMain.c:1049
+#: src/LYMain.c:1071
 msgid "No Winsock found, sorry."
 msgstr "Bedaŭrinde neniu Winsock"
 
-#: src/LYMain.c:1240
+#: src/LYMain.c:1262
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Vi devas difini validan provizoran dosierujon per la medivariabloj TMP aŭ TEMP!"
 
-#: src/LYMain.c:1293 src/LYMainLoop.c:5260
+#: src/LYMain.c:1315 src/LYMainLoop.c:5283
 msgid "No such directory"
 msgstr "Ne ekzistas tiu dosiero"
 
-#: src/LYMain.c:1487
+#: src/LYMain.c:1509
 #, c-format
 msgid ""
 "\n"
@@ -4285,7 +4370,7 @@ msgstr ""
 "Agorda dosiero \"%s\" ne disponeblas.\n"
 "\n"
 
-#: src/LYMain.c:1497
+#: src/LYMain.c:1519
 #, c-format
 msgid ""
 "\n"
@@ -4293,202 +4378,180 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Linko-kodoprezentoj ne deklaritaj.\n"
-"\n"
-
-#: src/LYMain.c:1526
-#, c-format
-msgid ""
-"\n"
-"Lynx edit map not declared.\n"
-"\n"
-msgstr ""
-"\n"
-"Linko-redaktomapo ne deklarita.\n"
-"\n"
-
-#: src/LYMain.c:1608
-#, c-format
-msgid ""
-"\n"
-"Lynx file \"%s\" is not available.\n"
-"\n"
-msgstr ""
-"\n"
-"Linko-dosiero \"%s\" ne disponeblas.\n"
+"Lynx-kodoprezentoj ne deklaritaj.\n"
 "\n"
 
-#: src/LYMain.c:1683
+#: src/LYMain.c:1675
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Ignoris %d signojn el la ĉefenigujo.\n"
 
-#: src/LYMain.c:1685
+#: src/LYMain.c:1677
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Uzu parametrojn \"-stdin\" aŭ \"-\" por specifi, kiel trakti enigojn tubajn.\n"
 
-#: src/LYMain.c:1843
+#: src/LYMain.c:1835
 msgid "Warning:"
 msgstr "Averto:"
 
-#: src/LYMain.c:2408
+#: src/LYMain.c:2405
 msgid "persistent cookies state will be changed in next session only."
 msgstr "stato de daŭrantaj kuketoj ŝanĝiĝos nur en la sekva seanco."
 
-#: src/LYMain.c:2644 src/LYMain.c:2689
+#: src/LYMain.c:2642 src/LYMain.c:2687
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
-msgstr "Linko: ignoranta nekonatan kodoprezenton=%s\n"
+msgstr "Lynx: ignoranta nekonatan kodoprezenton=%s\n"
 
-#: src/LYMain.c:3208
+#: src/LYMain.c:3206
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versio %s (%s)"
 
-#: src/LYMain.c:3246
+#: src/LYMain.c:3247
 #, c-format
-msgid "Built on %s %s %s\n"
-msgstr "Muntita je %s %s %s\n"
+msgid "Built on %s%s.\n"
+msgstr "Muntita je %s%s.\n"
 
-#: src/LYMain.c:3268
+#: src/LYMain.c:3261
 msgid "Copyrights held by the Lynx Developers Group,"
-msgstr "Kopirajtoj tenata de la Grupo pri Linko-Disvolvado,"
+msgstr "Kopirajtoj estas tenataj de la Grupo pri Lynx-disvolvado,"
 
-#: src/LYMain.c:3269
+#: src/LYMain.c:3262
 msgid "the University of Kansas, CERN, and other contributors."
-msgstr "la Universitato de Kansaso, CERN, kaj aliaj kontribuintoj."
+msgstr "la Universitato de Kansaso, CERN kaj aliaj kontribuintoj."
 
-#: src/LYMain.c:3270
+#: src/LYMain.c:3263
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribuita laŭ la GPL de GNU (Eldono 2)."
 
-#: src/LYMain.c:3271
-msgid "See http://lynx.isc.org/ and the online help for more information."
-msgstr "Vidu al http://lynx.isc.org/ por helpoj kaj informoj."
+#: src/LYMain.c:3264
+msgid "See http://lynx.invisible-island.net/ and the online help for more information."
+msgstr "Vidu al http://lynx.invisible-island.net/ kaj la enretaj helpoj por pliaj informoj."
 
-#: src/LYMain.c:4104
+#: src/LYMain.c:4107
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "UZO: %s [parametroj] [dosiero]\n"
 
-#: src/LYMain.c:4105
+#: src/LYMain.c:4108
 #, c-format
 msgid "Options are:\n"
 msgstr "Parametroj estas:\n"
 
-#: src/LYMain.c:4406
+#: src/LYMain.c:4411
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Nevalida parametro: %s\n"
 
-#: src/LYMainLoop.c:575
+#: src/LYMainLoop.c:572
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Interna eraro: Nevalida musa ligilo %d!"
 
-#: src/LYMainLoop.c:696 src/LYMainLoop.c:5282
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
 msgid "A URL specified by the user"
-msgstr "Retadreso specifita de la uzanto"
+msgstr "URL specifita de la uzanto"
 
-#: src/LYMainLoop.c:1148
+#: src/LYMainLoop.c:1142
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Encytpe multipart/form-data ne jam komprenita! Ne eblas sendi."
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3177
+#: src/LYMainLoop.c:3196
 msgid "Help Screen"
 msgstr "Helpo-fako"
 
-#: src/LYMainLoop.c:3308
+#: src/LYMainLoop.c:3327
 msgid "System Index"
 msgstr "Sistema indekso"
 
-#: src/LYMainLoop.c:3556
+#: src/LYMainLoop.c:3575
 #, c-format
 msgid "Query parameter %d: "
 msgstr "Menda parametro %d: "
 
-#: src/LYMainLoop.c:3781 src/LYMainLoop.c:5558
+#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
 msgid "Entry into main screen"
 msgstr "Eniro en ĉefan fakon"
 
-#: src/LYMainLoop.c:4039
+#: src/LYMainLoop.c:4062
 msgid "No next document present"
 msgstr "Neniu sekva dokumento ĉeesta"
 
-#: src/LYMainLoop.c:4334
+#: src/LYMainLoop.c:4357
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "bedaŭrinde kodoprezento por ĉi tiu dokumento specifita aparte..."
 
-#: src/LYMainLoop.c:5240
+#: src/LYMainLoop.c:5263
 msgid "cd to:"
 msgstr "ŝd al:"
 
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5286
 msgid "A component of path is not a directory"
 msgstr "Komponanto de vojo ne estas dosierujo"
 
-#: src/LYMainLoop.c:5266
+#: src/LYMainLoop.c:5289
 msgid "failed to change directory"
 msgstr "ŝanĝi dosierujon malsukcesis"
 
-#: src/LYMainLoop.c:6496
+#: src/LYMainLoop.c:6515
 msgid "Reparsing document under current settings..."
 msgstr "Reinterpretanta dokumenton laŭ nunaj agordaĵoj..."
 
-#: src/LYMainLoop.c:6790
+#: src/LYMainLoop.c:6809
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Paneanta eraro - ne povis malfermi eligan dosieron %s\n"
 
-#: src/LYMainLoop.c:7128
+#: src/LYMainLoop.c:7151
 msgid "TABLE center enable."
-msgstr "Ebligita centrigo de tabeloj."
+msgstr "Aktivigi centrigon de tabeloj."
 
-#: src/LYMainLoop.c:7131
+#: src/LYMainLoop.c:7154
 msgid "TABLE center disable."
-msgstr "Malebligita centrigo de tabeloj."
+msgstr "Malaktivigi centrigon de tabeloj."
 
-#: src/LYMainLoop.c:7211
+#: src/LYMainLoop.c:7234
 msgid "Current URL is empty."
-msgstr "Nuna retadreso estas vaka."
+msgstr "Nuna URL estas vaka."
 
-#: src/LYMainLoop.c:7213 src/LYUtils.c:1881
+#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
 msgid "Copy to clipboard failed."
 msgstr "Malsukcesis kopii al poŝo."
 
-#: src/LYMainLoop.c:7215
+#: src/LYMainLoop.c:7238
 msgid "Document URL put to clipboard."
-msgstr "Dokumenta retadreso enpoŝigita."
+msgstr "Dokumenta URL enpoŝigita."
 
-#: src/LYMainLoop.c:7217
+#: src/LYMainLoop.c:7240
 msgid "Link URL put to clipboard."
-msgstr "Ligila retadreso enpoŝigita."
+msgstr "Ligila URL enpoŝigita."
 
-#: src/LYMainLoop.c:7244
+#: src/LYMainLoop.c:7267
 msgid "No URL in the clipboard."
-msgstr "Neniu retadreso en la poŝo."
+msgstr "Neniu URL en la poŝo."
 
-#: src/LYMainLoop.c:7936 src/LYMainLoop.c:8105
+#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
 msgid "-index-"
 msgstr "-indekso-"
 
-#: src/LYMainLoop.c:8045
+#: src/LYMainLoop.c:8069
 msgid "lynx: Can't access startfile"
-msgstr "Linko: ne eblas atingi hejmdosieron"
+msgstr "Lynx: ne eblas atingi hejmdosieron"
 
-#: src/LYMainLoop.c:8057
+#: src/LYMainLoop.c:8081
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
-msgstr "Linko: Hejmdosiero ne estis trovita aŭ ne havis la tipon text/html aŭ text/plain"
+msgstr "Lynx: Hejmdosiero ne estis trovita aŭ ne havis la tipon text/html aŭ text/plain"
 
-#: src/LYMainLoop.c:8058
+#: src/LYMainLoop.c:8082
 msgid "      Exiting..."
 msgstr "      Eliranta..."
 
-#: src/LYMainLoop.c:8099
+#: src/LYMainLoop.c:8125
 msgid "-more-"
 msgstr "-plu-"
 
@@ -4552,369 +4615,382 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Mesaĝo havas neniun originalan tekston!"
 
-#: src/LYOptions.c:770
+#: src/LYOptions.c:774
 msgid "review/edit B)ookmarks files"
 msgstr "kontroli/redakti B) legosignajn dosierojn"
 
-#: src/LYOptions.c:772
+#: src/LYOptions.c:776
 msgid "B)ookmark file: "
 msgstr "B) Legosigna dosiero: "
 
-#: src/LYOptions.c:2120 src/LYOptions.c:2127
+#: src/LYOptions.c:2123 src/LYOptions.c:2130
 msgid "ON"
 msgstr "Ŝaltita"
 
 #. verbose_img variable
-#: src/LYOptions.c:2121 src/LYOptions.c:2126 src/LYOptions.c:2289
-#: src/LYOptions.c:2300
+#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2302
+#: src/LYOptions.c:2313
 msgid "OFF"
 msgstr "Malŝaltita"
 
-#: src/LYOptions.c:2122
+#: src/LYOptions.c:2125
 msgid "NEVER"
 msgstr "Neniam"
 
-#: src/LYOptions.c:2123
+#: src/LYOptions.c:2126
 msgid "ALWAYS"
 msgstr "Ĉiam"
 
-#: src/LYOptions.c:2139 src/LYOptions.c:2281
+#: src/LYOptions.c:2142 src/LYOptions.c:2294
 msgid "ignore"
 msgstr "ignoru"
 
-#: src/LYOptions.c:2140
+#: src/LYOptions.c:2143
 msgid "ask user"
 msgstr "demandu al uzanto"
 
-#: src/LYOptions.c:2141
+#: src/LYOptions.c:2144
 msgid "accept all"
 msgstr "akceptu ĉiujn"
 
-#: src/LYOptions.c:2153
+#: src/LYOptions.c:2156
 msgid "ALWAYS OFF"
 msgstr "Ĉiam malŝaltita"
 
-#: src/LYOptions.c:2154
+#: src/LYOptions.c:2157
 msgid "FOR LOCAL FILES ONLY"
 msgstr "Nur por lokaj dosieroj"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS ON"
 msgstr "Ĉiam ŝaltita"
 
-#: src/LYOptions.c:2168
+#: src/LYOptions.c:2171
 msgid "Numbers act as arrows"
 msgstr "Nombroj kondutas kiel sagoj"
 
-#: src/LYOptions.c:2170
+#: src/LYOptions.c:2173
 msgid "Links are numbered"
 msgstr "Ligiloj estas nombritaj"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links and form fields are numbered"
 msgstr "Ligiloj kaj formularaj kampoj estas nombritaj"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Form fields are numbered"
 msgstr "Formularaj kampoj estas nombritaj"
 
-#: src/LYOptions.c:2191
+#: src/LYOptions.c:2194
 msgid "Case insensitive"
 msgstr "Uskleco ne gravas"
 
-#: src/LYOptions.c:2192
+#: src/LYOptions.c:2195
 msgid "Case sensitive"
 msgstr "Uskleco gravas"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2229
 msgid "prompt normally"
 msgstr "demandu kiel ordinare"
 
-#: src/LYOptions.c:2217
+#: src/LYOptions.c:2230
 msgid "force yes-response"
 msgstr "devigu respondon jesan"
 
-#: src/LYOptions.c:2218
+#: src/LYOptions.c:2231
 msgid "force no-response"
 msgstr "devigu respondon nean"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2249
 msgid "Novice"
 msgstr "Novula"
 
-#: src/LYOptions.c:2237
+#: src/LYOptions.c:2250
 msgid "Intermediate"
 msgstr "Meznivela"
 
-#: src/LYOptions.c:2238
+#: src/LYOptions.c:2251
 msgid "Advanced"
 msgstr "Altnivela"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2260
 msgid "By First Visit"
 msgstr "Laŭ unua vizito"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2262
 msgid "By First Visit Reversed"
 msgstr "Laŭ unua vizito inversigita"
 
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2263
 msgid "As Visit Tree"
 msgstr "Kiel vizita arbo"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2264
 msgid "By Last Visit"
 msgstr "Laŭ lasta vizito"
 
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2266
 msgid "By Last Visit Reversed"
 msgstr "Laŭ lasta vizito inversigita"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2277
 msgid "relaxed (TagSoup mode)"
 msgstr "malsevera"
 
-#: src/LYOptions.c:2265
+#: src/LYOptions.c:2278
 msgid "strict (SortaSGML mode)"
 msgstr "severa"
 
-#: src/LYOptions.c:2272
+#: src/LYOptions.c:2285
 msgid "Ignore"
 msgstr "Ignoru"
 
-#: src/LYOptions.c:2273
+#: src/LYOptions.c:2286
 msgid "Add to trace-file"
 msgstr "Aldonu al spuro-dosiero"
 
-#: src/LYOptions.c:2274
+#: src/LYOptions.c:2287
 msgid "Add to LYNXMESSAGES"
 msgstr "Aldonu al LYNXMESSAGES"
 
-#: src/LYOptions.c:2275
+#: src/LYOptions.c:2288
 msgid "Warn, point to trace-file"
 msgstr "Avertu, almontru al spuro-dosiero"
 
-#: src/LYOptions.c:2282
+#: src/LYOptions.c:2295
 msgid "as labels"
 msgstr "kiel teksto"
 
-#: src/LYOptions.c:2283
+#: src/LYOptions.c:2296
 msgid "as links"
 msgstr "kiel ligiloj"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2303
 msgid "show filename"
 msgstr "montri dosiernomon"
 
-#: src/LYOptions.c:2301
+#: src/LYOptions.c:2314
 msgid "STANDARD"
 msgstr "ORDINARA"
 
-#: src/LYOptions.c:2302
+#: src/LYOptions.c:2315
 msgid "ADVANCED"
 msgstr "ALTNIVELA"
 
-#: src/LYOptions.c:2336
+#: src/LYOptions.c:2349
 msgid "Directories first"
 msgstr "Dosierujoj antaŭ dosieroj"
 
-#: src/LYOptions.c:2337
+#: src/LYOptions.c:2350
 msgid "Files first"
 msgstr "Dosieroj antaŭ dosierujoj"
 
-#: src/LYOptions.c:2338
+#: src/LYOptions.c:2351
 msgid "Mixed style"
 msgstr "Miksita ordo"
 
-#: src/LYOptions.c:2346 src/LYOptions.c:2366
+#: src/LYOptions.c:2359 src/LYOptions.c:2379
 msgid "By Name"
 msgstr "Laŭ nomo"
 
-#: src/LYOptions.c:2347 src/LYOptions.c:2367
+#: src/LYOptions.c:2360 src/LYOptions.c:2380
 msgid "By Type"
 msgstr "Laŭ tipo"
 
-#: src/LYOptions.c:2348 src/LYOptions.c:2368
+#: src/LYOptions.c:2361 src/LYOptions.c:2381
 msgid "By Size"
 msgstr "Laŭ grando"
 
-#: src/LYOptions.c:2349 src/LYOptions.c:2369
+#: src/LYOptions.c:2362 src/LYOptions.c:2382
 msgid "By Date"
 msgstr "Laŭ dato"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2363
 msgid "By Mode"
 msgstr "Laŭ reĝimo"
 
-#: src/LYOptions.c:2352
+#: src/LYOptions.c:2365
 msgid "By User"
 msgstr "Laŭ uzanto"
 
-#: src/LYOptions.c:2353
+#: src/LYOptions.c:2366
 msgid "By Group"
 msgstr "Laŭ grupo"
 
-#: src/LYOptions.c:2378
+#: src/LYOptions.c:2391
 msgid "Do not show rate"
 msgstr "Ne montru rapidon"
 
-#: src/LYOptions.c:2379 src/LYOptions.c:2380
+#: src/LYOptions.c:2392 src/LYOptions.c:2393
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Montru rapidon (%s en sekundo)"
 
-#: src/LYOptions.c:2382 src/LYOptions.c:2383
+#: src/LYOptions.c:2395 src/LYOptions.c:2396
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Montru aproksimatan %sn en sekundo"
 
-#: src/LYOptions.c:2386
+#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#, c-format
+msgid "Show %s/sec (2-digits), ETA"
+msgstr "Montru aproksimatan %sn en sekundo (duciferan)"
+
+#: src/LYOptions.c:2401
 msgid "Show progressbar"
 msgstr "Montru progresilon"
 
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2413
 msgid "Accept lynx's internal types"
-msgstr "Akceptu la internajn tipojn de Linko"
+msgstr "Akceptu la internajn tipojn de Lynx"
 
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2414
 msgid "Also accept lynx.cfg's types"
 msgstr "Ankaŭ akceptu la tipojn de lynx.cfg"
 
-#: src/LYOptions.c:2400
+#: src/LYOptions.c:2415
 msgid "Also accept user's types"
 msgstr " Ankaŭ akceptu tipojn de uzantoj"
 
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2416
 msgid "Also accept system's types"
 msgstr "Ankaŭ akceptu tipojn el la sistemo"
 
-#: src/LYOptions.c:2402
+#: src/LYOptions.c:2417
 msgid "Accept all types"
 msgstr "Akceptu ĉiujn tipojn"
 
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2426
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2412
+#: src/LYOptions.c:2427
 msgid "deflate"
 msgstr "malgrandigo"
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2430
 msgid "compress"
 msgstr "kunpremo"
 
-#: src/LYOptions.c:2418
+#: src/LYOptions.c:2433
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2420
+#: src/LYOptions.c:2435
 msgid "All"
 msgstr "Ĉiuj"
 
-#: src/LYOptions.c:2699 src/LYOptions.c:2728
+#: src/LYOptions.c:2801 src/LYOptions.c:2830
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Uzu la klavon %s por la agorda menuo."
 
-#: src/LYOptions.c:3541
+#: src/LYOptions.c:3688
 msgid "(options marked with (!) will not be saved)"
 msgstr "(agordaĵoj markitaj kun (!) ne estos konservitaj)"
 
-#: src/LYOptions.c:3549
+#: src/LYOptions.c:3696
 msgid "General Preferences"
 msgstr "Ĝeneralaj preferoj"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3553
+#: src/LYOptions.c:3700
 msgid "User mode"
 msgstr "Uzantoreĝimo"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3706
 msgid "Editor"
 msgstr "Tekstoredaktilo"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3564
+#: src/LYOptions.c:3711
 msgid "Type of Search"
 msgstr "Serĉtipo"
 
-#: src/LYOptions.c:3569
+#: src/LYOptions.c:3716
 msgid "Security and Privacy"
 msgstr "Sekureco kaj privateco"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3573
+#: src/LYOptions.c:3720
 msgid "Cookies"
 msgstr "Kuketoj"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3587
+#: src/LYOptions.c:3734
 msgid "Invalid-Cookie Prompting"
 msgstr "Demandoj pri nevalidaj kuketoj"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3594
+#: src/LYOptions.c:3741
 msgid "SSL Prompting"
 msgstr "SSL-demandoj"
 
-#: src/LYOptions.c:3600
+#: src/LYOptions.c:3746
+msgid "SSL client certificate file"
+msgstr "SSL-klienta atesto-dosiero"
+
+#: src/LYOptions.c:3750
+msgid "SSL client key file"
+msgstr "SSL-klienta ŝlosilo-dosiero"
+
+#: src/LYOptions.c:3756
 msgid "Keyboard Input"
 msgstr "Klavara enmeto"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3760
 msgid "Keypad mode"
 msgstr "Ciferklavara reĝimo"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3610
+#: src/LYOptions.c:3766
 msgid "Emacs keys"
 msgstr "Klavoj kiel Emakso"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3616
+#: src/LYOptions.c:3772
 msgid "VI keys"
 msgstr "Klavoj kiel Vi"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3623
+#: src/LYOptions.c:3779
 msgid "Line edit style"
 msgstr "Linio-redaktila stilo"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3635
+#: src/LYOptions.c:3791
 msgid "Keyboard layout"
 msgstr "Klavararanĝo"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3649
+#: src/LYOptions.c:3805
 msgid "Display and Character Set"
 msgstr "Elmontrado kaj kodoprezento"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3810
 msgid "Use locale-based character set"
 msgstr "Uzi lokaĵaran kodoprezenton"
 
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3817
 msgid "Use HTML5 charset replacements"
 msgstr "Anstataŭigi signojn laŭ HTML5"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3667
+#: src/LYOptions.c:3823
 msgid "Display character set"
 msgstr "Elmontra kodoprezento"
 
-#: src/LYOptions.c:3698
+#: src/LYOptions.c:3854
 msgid "Assumed document character set"
 msgstr "Apriora dokumenta kodoprezento"
 
@@ -4923,263 +4999,272 @@ msgstr "Apriora dokumenta kodoprezento"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3718
+#: src/LYOptions.c:3874
 msgid "CJK mode"
 msgstr "Azia reĝimo"
 
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3876
 msgid "Raw 8-bit"
 msgstr "Nuda 8-bita"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3884
 msgid "X Display"
 msgstr "X-servilo"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3890
 msgid "Document Appearance"
 msgstr "Dokumenta aspekto"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3896
 msgid "Show color"
 msgstr "Montri kolorojn"
 
+#. Color style: ON/OFF
+#: src/LYOptions.c:3921
+msgid "Color style"
+msgstr "Kolora stilo"
+
+#: src/LYOptions.c:3930
+msgid "Default colors"
+msgstr "Aprioraj koloroj"
+
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3764
+#: src/LYOptions.c:3938
 msgid "Show cursor"
 msgstr "Montri kursoron"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3770
+#: src/LYOptions.c:3944
 msgid "Underline links"
 msgstr "Substreki ligilojn"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3777
+#: src/LYOptions.c:3951
 msgid "Show scrollbar"
 msgstr "Montri rulumilon"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3784
+#: src/LYOptions.c:3958
 msgid "Popups for select fields"
 msgstr "Ŝprucmenuoj por iaj kampoj"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3790
+#: src/LYOptions.c:3964
 msgid "HTML error recovery"
 msgstr "HTML-erara riparado"
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3796
+#: src/LYOptions.c:3970
 msgid "Bad HTML messages"
 msgstr "Mesaĝoj pri fuŝa HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3976
 msgid "Show images"
 msgstr "Montri bildojn"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3990
 msgid "Verbose images"
 msgstr "Vortplenaj bildoj"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3824
+#: src/LYOptions.c:3998
 msgid "Headers Transferred to Remote Servers"
 msgstr "Ĉapoj transigitaj al foraj serviloj"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3828
+#: src/LYOptions.c:4002
 msgid "Personal mail address"
 msgstr "Propra retpoŝtadreso"
 
-#: src/LYOptions.c:3833
+#: src/LYOptions.c:4007
 msgid "Personal name for mail"
 msgstr "Propra nomo por la retpoŝtadreso"
 
-#: src/LYOptions.c:3840
+#: src/LYOptions.c:4014
 msgid "Password for anonymous ftp"
 msgstr "Pasvorto por sennoma FTP"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3846
+#: src/LYOptions.c:4020
 msgid "Preferred media type"
 msgstr "Preferata enhavtipo"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3852
+#: src/LYOptions.c:4026
 msgid "Preferred encoding"
 msgstr "Preferata kunprema formato"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3858
+#: src/LYOptions.c:4032
 msgid "Preferred document character set"
 msgstr "Preferata dokumenta kodoprezento"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:4037
 msgid "Preferred document language"
 msgstr "Preferata dokumenta lingvo"
 
-#: src/LYOptions.c:3869
+#: src/LYOptions.c:4043
 msgid "Send User-Agent header"
 msgstr "Konigi la TTT-legilon"
 
-#: src/LYOptions.c:3871
+#: src/LYOptions.c:4045
 msgid "User-Agent header"
 msgstr "TTT-legila identigilo"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:4053
 msgid "Listing and Accessing Files"
 msgstr "Listigi kaj atingi dosierojn"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:4058
 msgid "Use Passive FTP"
 msgstr "Uzu pasivan FTP-on"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:4064
 msgid "FTP sort criteria"
 msgstr "FTP-ordigaj kriterioj"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:4072
 msgid "Local directory sort criteria"
 msgstr "Ordigi lokajn dosierujojn kun"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3904
+#: src/LYOptions.c:4078
 msgid "Local directory sort order"
 msgstr "Ordo por lokaj dosierujoj"
 
-#: src/LYOptions.c:3913
+#: src/LYOptions.c:4087
 msgid "Show dot files"
 msgstr "Montri punkto-dosierojn"
 
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:4095
 msgid "Execution links"
 msgstr "Plenumeblaj ligiloj"
 
-#: src/LYOptions.c:3939
+#: src/LYOptions.c:4113
 msgid "Pause when showing message"
 msgstr "Paŭzu dum montri mesaĝojn"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3946
+#: src/LYOptions.c:4120
 msgid "Show transfer rate"
 msgstr "Montri transigo-rapidon"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3966
+#: src/LYOptions.c:4140
 msgid "Special Files and Screens"
 msgstr "Specialaj dosieroj kaj ekranoj"
 
-#: src/LYOptions.c:3971
+#: src/LYOptions.c:4145
 msgid "Multi-bookmarks"
 msgstr "Plurnivelaj legosignoj"
 
-#: src/LYOptions.c:3979
+#: src/LYOptions.c:4153
 msgid "Review/edit Bookmarks files"
 msgstr "Kontroli/redakti legosignajn dosierojn"
 
-#: src/LYOptions.c:3982
+#: src/LYOptions.c:4156
 msgid "Goto multi-bookmark menu"
 msgstr "Iri al menuo pri plurnivelaj legosignoj"
 
-#: src/LYOptions.c:3984
+#: src/LYOptions.c:4158
 msgid "Bookmarks file"
 msgstr "Legosigna dosiero"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3991
+#: src/LYOptions.c:4165
 msgid "Auto Session"
 msgstr "Aŭtomata seanco"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3997
+#: src/LYOptions.c:4171
 msgid "Session file"
 msgstr "Seanco-dosiero"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4003
+#: src/LYOptions.c:4177
 msgid "Visited Pages"
 msgstr "Vizititaj paĝoj"
 
-#: src/LYOptions.c:4008
+#: src/LYOptions.c:4182
 msgid "View the file "
 msgstr "Vidi la dosierojn "
 
-#: src/LYPrint.c:947
+#: src/LYPrint.c:955
 #, c-format
 msgid " Print job complete.\n"
 msgstr " Printo-tasko kompleta.\n"
 
-#: src/LYPrint.c:1274
+#: src/LYPrint.c:1282
 msgid "Document:"
 msgstr "Dokumento:"
 
-#: src/LYPrint.c:1275
+#: src/LYPrint.c:1283
 msgid "Number of lines:"
 msgstr "Nombro da linioj:"
 
-#: src/LYPrint.c:1276
+#: src/LYPrint.c:1284
 msgid "Number of pages:"
 msgstr "Nombro da paĝoj:"
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
 msgid "pages"
 msgstr "paĝoj"
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
 msgid "page"
 msgstr "paĝo"
 
-#: src/LYPrint.c:1278
+#: src/LYPrint.c:1286
 msgid "(approximately)"
 msgstr "(proksimume)"
 
-#: src/LYPrint.c:1285
+#: src/LYPrint.c:1293
 msgid "Some print functions have been disabled!"
-msgstr "Iuj printaj funkcioj estis malebligitaj!"
+msgstr "Iuj printaj funkcioj estis malaktivigitaj!"
 
-#: src/LYPrint.c:1289
+#: src/LYPrint.c:1297
 msgid "Standard print options:"
 msgstr "Ordinaraj printaj agordaĵoj:"
 
-#: src/LYPrint.c:1290
+#: src/LYPrint.c:1298
 msgid "Print options:"
 msgstr "Printaj agordaĵoj"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1305
 msgid "Save to a local file"
 msgstr "Konservi al loka dosiero"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1307
 msgid "Save to disk disabled"
-msgstr "Konservado al disko malebligita"
+msgstr "Konservado al disko malaktivigita"
 
-#: src/LYPrint.c:1306
+#: src/LYPrint.c:1314
 msgid "Mail the file"
 msgstr "Sendi la dosieron per retpoŝto"
 
-#: src/LYPrint.c:1313
+#: src/LYPrint.c:1321
 msgid "Print to the screen"
 msgstr "Printi la ekranon"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1326
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Printi al printilo almetita al via terminalo vt100"
 
@@ -5204,291 +5289,291 @@ msgstr ""
 msgid "Offending line:"
 msgstr "Ofenda linio:"
 
-#: src/LYReadCFG.c:757
+#: src/LYReadCFG.c:769
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "klavoŝanĝo de %s al %s por %s malsukcesis\n"
 
-#: src/LYReadCFG.c:764
+#: src/LYReadCFG.c:776
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "klavoŝanĝo de %s al %s malsukcesis\n"
 
-#: src/LYReadCFG.c:785
+#: src/LYReadCFG.c:797
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "nevalida linio-redaktila elekto %s por klavo %s, elektanta ĉion\n"
 
-#: src/LYReadCFG.c:810 src/LYReadCFG.c:822
+#: src/LYReadCFG.c:822 src/LYReadCFG.c:834
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "agordi linio-redaktilan bindadon por klavo %s (0x%x) al 0x(%x) por %s malsukcesis\n"
 
-#: src/LYReadCFG.c:826
+#: src/LYReadCFG.c:838
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "agordi linio-redaktilon bindadon por klavo %s (0x%x) por %s malsukcesis\n"
 
-#: src/LYReadCFG.c:922
+#: src/LYReadCFG.c:934
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
-msgstr "Linko: ne eblas starti, CERN-regula dosiero %s ne disponeblas\n"
+msgstr "Lynx: ne eblas starti, CERN-regula dosiero %s ne disponeblas\n"
 
-#: src/LYReadCFG.c:923
+#: src/LYReadCFG.c:935
 msgid "(no name)"
 msgstr "(neniu nomo)"
 
-#: src/LYReadCFG.c:2044
+#: src/LYReadCFG.c:2075
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Pli ol %d nestita inkludoj en lynx.cfg -- eble estas volvaĵo?\n"
 
-#: src/LYReadCFG.c:2046
+#: src/LYReadCFG.c:2077
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Lasta provita inkludo estis '%s',\n"
 
-#: src/LYReadCFG.c:2047
+#: src/LYReadCFG.c:2078
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluzivita el '%s'.\n"
 
-#: src/LYReadCFG.c:2450 src/LYReadCFG.c:2463 src/LYReadCFG.c:2521
+#: src/LYReadCFG.c:2481 src/LYReadCFG.c:2494 src/LYReadCFG.c:2552
 msgid "The following is read from your lynx.cfg file."
 msgstr "La jena estis legita el la dosiero lynx.cfg."
 
-#: src/LYReadCFG.c:2451 src/LYReadCFG.c:2464
+#: src/LYReadCFG.c:2482 src/LYReadCFG.c:2495
 msgid "Please read the distribution"
 msgstr "Bonvolu legi la distribuaĵon"
 
-#: src/LYReadCFG.c:2457 src/LYReadCFG.c:2467
+#: src/LYReadCFG.c:2488 src/LYReadCFG.c:2498
 msgid "for more comments."
 msgstr "por pliaj komentoj."
 
-#: src/LYReadCFG.c:2503
+#: src/LYReadCFG.c:2534
 msgid "RELOAD THE CHANGES"
 msgstr "REŜARGU LA ŜANĜOJ"
 
-#: src/LYReadCFG.c:2511
+#: src/LYReadCFG.c:2542
 msgid "Your primary configuration"
 msgstr "Via ĉefa agordo"
 
-#: src/LYShowInfo.c:177
+#: src/LYShowInfo.c:111
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:196
 msgid "Directory that you are currently viewing"
-msgstr "Dosierujo, kiun vi aktuale estas rigardanta"
+msgstr "Dosierujo, kiun vi nune estas rigardanta"
 
-#: src/LYShowInfo.c:180
+#: src/LYShowInfo.c:199
 msgid "Name:"
 msgstr "Nomo:"
 
-#: src/LYShowInfo.c:183
-msgid "URL:"
-msgstr "Retadreso:"
-
-#: src/LYShowInfo.c:197
+#: src/LYShowInfo.c:216
 msgid "Directory that you have currently selected"
-msgstr "Dosiero, kiu estas aktuale elektita"
+msgstr "Dosiero, kiu estas nune elektita"
 
-#: src/LYShowInfo.c:199
+#: src/LYShowInfo.c:218
 msgid "File that you have currently selected"
-msgstr "Dosiero, kiu estas aktuale elektita"
+msgstr "Dosiero, kiu estas nune elektita"
 
-#: src/LYShowInfo.c:202
+#: src/LYShowInfo.c:221
 msgid "Symbolic link that you have currently selected"
-msgstr "Mola ligilo, kiu estas aktuale elektita"
+msgstr "Mola ligilo, kiu estas nune elektita"
 
-#: src/LYShowInfo.c:205
+#: src/LYShowInfo.c:224
 msgid "Item that you have currently selected"
-msgstr "Ero, kiu estas aktuale elektita"
+msgstr "Ero, kiu estas nune elektita"
 
-#: src/LYShowInfo.c:207
+#: src/LYShowInfo.c:226
 msgid "Full name:"
 msgstr "Plena nomo:"
 
-#: src/LYShowInfo.c:217
+#: src/LYShowInfo.c:239
 msgid "Unable to follow link"
 msgstr "Ne eblas sekvi ligilon"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:241
 msgid "Points to file:"
 msgstr "Almontras al dosiero:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:246
 msgid "Name of owner:"
 msgstr "Nomo de estro:"
 
-#: src/LYShowInfo.c:227
+#: src/LYShowInfo.c:249
 msgid "Group name:"
 msgstr "Grupnomo:"
 
-#: src/LYShowInfo.c:229
+#: src/LYShowInfo.c:251
 msgid "File size:"
 msgstr "Dosiergrando"
 
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:253
 msgid "(bytes)"
 msgstr "(bajtoj)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:236
+#: src/LYShowInfo.c:258
 msgid "Creation date:"
 msgstr "Krea dato:"
 
-#: src/LYShowInfo.c:239
+#: src/LYShowInfo.c:261
 msgid "Last modified:"
 msgstr "Laste modifita:"
 
-#: src/LYShowInfo.c:242
+#: src/LYShowInfo.c:264
 msgid "Last accessed:"
 msgstr "Laste atingita:"
 
-#: src/LYShowInfo.c:248
+#: src/LYShowInfo.c:270
 msgid "Access Permissions"
 msgstr "Atingaj permesoj"
 
-#: src/LYShowInfo.c:283
+#: src/LYShowInfo.c:305
 msgid "Group:"
 msgstr "Grupo:"
 
-#: src/LYShowInfo.c:303
+#: src/LYShowInfo.c:325
 msgid "World:"
 msgstr "Mondo:"
 
-#: src/LYShowInfo.c:310
+#: src/LYShowInfo.c:332
 msgid "File that you are currently viewing"
-msgstr "Dosiero, kiun vi estas aktuale rigardanta"
+msgstr "Dosiero, kiun vi estas nune rigardanta"
 
-#: src/LYShowInfo.c:318 src/LYShowInfo.c:422
+#: src/LYShowInfo.c:340 src/LYShowInfo.c:444
 msgid "Linkname:"
 msgstr "Ligilnomo:"
 
-#: src/LYShowInfo.c:324 src/LYShowInfo.c:339
+#: src/LYShowInfo.c:346 src/LYShowInfo.c:361
 msgid "Charset:"
 msgstr "Kodoprezento:"
 
-#: src/LYShowInfo.c:338
+#: src/LYShowInfo.c:360
 msgid "(assumed)"
 msgstr "(supozita)"
 
-#: src/LYShowInfo.c:345
+#: src/LYShowInfo.c:367
 msgid "Server:"
 msgstr "Servilo:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:370
 msgid "Date:"
 msgstr "Dato:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:373
 msgid "Last Mod:"
 msgstr "Lasta modifo:"
 
-#: src/LYShowInfo.c:356
+#: src/LYShowInfo.c:378
 msgid "Expires:"
 msgstr "Eksvalidiĝos:"
 
-#: src/LYShowInfo.c:359
+#: src/LYShowInfo.c:381
 msgid "Cache-Control:"
 msgstr "Tenejo-Kontrolo:"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:384
 msgid "Content-Length:"
 msgstr "Enhavo-longo:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:388
 msgid "Length:"
 msgstr "Longo:"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:393
 msgid "Language:"
 msgstr "Lingvo:"
 
-#: src/LYShowInfo.c:378
+#: src/LYShowInfo.c:400
 msgid "Post Data:"
 msgstr "Kaŝitaj datumoj"
 
-#: src/LYShowInfo.c:381
+#: src/LYShowInfo.c:403
 msgid "Post Content Type:"
 msgstr "Enhavo-tipo de kaŝitaj datumoj:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:406
 msgid "Owner(s):"
 msgstr "Estro(j):"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:411
 msgid "size:"
 msgstr "Grando:"
 
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:413
 msgid "lines"
 msgstr "linioj"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:417
 msgid "forms mode"
 msgstr "formulara reĝimo"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:419
 msgid "source"
 msgstr "fontoteksto"
 
-#: src/LYShowInfo.c:398
+#: src/LYShowInfo.c:420
 msgid "normal"
 msgstr "kutima"
 
-#: src/LYShowInfo.c:400
+#: src/LYShowInfo.c:422
 msgid ", safe"
 msgstr ", sekura"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:424
 msgid ", via internal link"
 msgstr ", per interna ligilo"
 
-#: src/LYShowInfo.c:407
+#: src/LYShowInfo.c:429
 msgid ", no-cache"
 msgstr ", sen tenejo"
 
-#: src/LYShowInfo.c:409
+#: src/LYShowInfo.c:431
 msgid ", ISMAP script"
 msgstr ", ISMAP-programeto"
 
-#: src/LYShowInfo.c:411
+#: src/LYShowInfo.c:433
 msgid ", bookmark file"
 msgstr ", legosigna dosiero"
 
-#: src/LYShowInfo.c:415
+#: src/LYShowInfo.c:437
 msgid "mode:"
 msgstr "Reĝimo:"
 
-#: src/LYShowInfo.c:421
+#: src/LYShowInfo.c:443
 msgid "Link that you currently have selected"
-msgstr "Ligilo, kiu estas aktuale elektita"
+msgstr "Ligilo, kiu estas nune elektita"
 
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:452
 msgid "Method:"
 msgstr "Metodo:"
 
-#: src/LYShowInfo.c:434
+#: src/LYShowInfo.c:456
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:462
 msgid "Action:"
 msgstr "Ago:"
 
-#: src/LYShowInfo.c:446
+#: src/LYShowInfo.c:468
 msgid "(Form field)"
 msgstr "(Formulara kampo)"
 
-#: src/LYShowInfo.c:457
+#: src/LYShowInfo.c:478
 msgid "No Links on the current page"
 msgstr "Neniuj ligiloj en la nuna paĝo"
 
-#: src/LYShowInfo.c:463
+#: src/LYShowInfo.c:484
 msgid "Server Headers:"
 msgstr "Servilaj kapoj:"
 
-#: src/LYStyle.c:331
+#: src/LYStyle.c:338
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5505,6 +5590,17 @@ msgstr ""
 "ELEMENTO estas unu el EM,STRONG,I,U,BLINK ktp.\n"
 "\n"
 
+#: src/LYStyle.c:933
+#, c-format
+msgid ""
+"\n"
+"Lynx file \"%s\" is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx-dosiero \"%s\" ne disponeblas.\n"
+"\n"
+
 #: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "jen listo de la historio-stako por ke vi povu rekonstrui"
@@ -5529,41 +5625,41 @@ msgstr "Nevalida alidirektado per \"~\" trovita! Peto ignorita."
 msgid "Unable to upload file."
 msgstr "Ne eblas alŝuti dosieron."
 
-#: src/LYUpload.c:199
+#: src/LYUpload.c:196
 msgid "Upload To:"
 msgstr "Alŝuti al:"
 
-#: src/LYUpload.c:200
+#: src/LYUpload.c:197
 msgid "Upload options:"
 msgstr "Alŝutaj elektoj:"
 
-#: src/LYUtils.c:1883
+#: src/LYUtils.c:1919
 msgid "Download document URL put to clipboard."
-msgstr "Elŝuti dokumentan retadreson en poŝo."
+msgstr "Elŝuti dokumentan URL-on en poŝo."
 
-#: src/LYUtils.c:2668
+#: src/LYUtils.c:2666
 msgid "Unexpected access protocol for this URL scheme."
-msgstr "Neanticipita atingo-protokolo por tiu retadresa skemo."
+msgstr "Neatendita atingo-protokolo por tiu URL-skemo."
 
-#: src/LYUtils.c:3492
+#: src/LYUtils.c:3571
 msgid "Too many tempfiles"
 msgstr "Tro da provizoraj dosieroj"
 
-#: src/LYUtils.c:3792
+#: src/LYUtils.c:3871
 msgid "unknown restriction"
 msgstr "nekonata malhelpo"
 
-#: src/LYUtils.c:3823
+#: src/LYUtils.c:3902
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Neniuj malhelpoj elektitaj.\n"
 
-#: src/LYUtils.c:3826
+#: src/LYUtils.c:3905
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Malhelpoj elektitaj:\n"
 
-#: src/LYUtils.c:5212
+#: src/LYUtils.c:5279
 msgid "Cannot find HOME directory"
 msgstr "Ne eblas trovi la hejmdosierujon."
 
@@ -5571,7 +5667,7 @@ msgstr "Ne eblas trovi la hejmdosierujon."
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Ordinare malaktivigite. Ŝanĝi la agordaĵon ENABLE_LYNXRC en lynx.cfg\n"
 
-#: src/LYrcFile.c:325
+#: src/LYrcFile.c:327
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5583,19 +5679,19 @@ msgstr ""
 "pri ĉiu kuketo. Valoro \"TRUE\" akceptos\n"
 "ĉiujn kuketojn.\n"
 
-#: src/LYrcFile.c:333
+#: src/LYrcFile.c:335
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
 "Lynx will use the personal email address.  Set anonftp_password\n"
 "to a different value if you choose.\n"
 msgstr ""
-"anonftp_password permesas, ke uzanto specifu al Linko propran\n"
+"anonftp_password permesas, ke uzanto specifu al Lynx propran\n"
 "retpoŝtadreson kiel la posvorton por sennoma FTP. Se ne havas\n"
-"valoron,Linko uzos la propran retpoŝtadreson. Laŭvole\n"
+"valoron, Lynx uzos la propran retpoŝtadreson. Laŭvole\n"
 "elektu alian valoron.\n"
 
-#: src/LYrcFile.c:342
+#: src/LYrcFile.c:344
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
@@ -5605,7 +5701,7 @@ msgstr ""
 "dosiero en kiu la uzanto povas alglui ligilojn por facila atingo\n"
 "pli malfrue.\n"
 
-#: src/LYrcFile.c:347
+#: src/LYrcFile.c:349
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5615,7 +5711,7 @@ msgstr ""
 "serĉo per la klavojn 's' aŭ '/', la serĉo plenumota ne ignoros la usklecon\n"
 "anstataŭ la ordinara konduto de ignori usklecon (valoro \"off\").\n"
 
-#: src/LYrcFile.c:352
+#: src/LYrcFile.c:354
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5627,9 +5723,9 @@ msgstr ""
 "signoj por via terminalo. Se 8-bitaj signoj ne ĝuste elmontriĝas\n"
 "ĉe via ekrano, vi provu malsaman 8-bitan kodoprezenton\n"
 "aŭ uzu la 7-bitajn kodoprezentajn aproksimaĵojn.\n"
-"Aktuale validaj kodoprezentoj estas:\n"
+"Nune validaj kodoprezentoj estas:\n"
 
-#: src/LYrcFile.c:359
+#: src/LYrcFile.c:361
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5638,12 +5734,12 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 "cookie_accept_domains kaj cookie_reject domains estas listoj de domajnoj\n"
-"el kiuj Linko aŭtomate akceptu aŭ rifuzu (respektive) ĉiujn kuketojn,\n"
+"el kiuj Lynx aŭtomate akceptu aŭ rifuzu (respektive) ĉiujn kuketojn,\n"
 "apartigita per komoj. Se domajno estas specifita en ambaŭ agordaĵoj, rifuzado\n"
 "regos. La parametro accept_all_cookies superregos ĉiujn\n"
 "agordaĵojn ĉi tie.\n"
 
-#: src/LYrcFile.c:367
+#: src/LYrcFile.c:369
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
@@ -5651,7 +5747,7 @@ msgstr ""
 "cookie_file specifas la dosieron el kiu legi daŭrantajn kuketojn.\n"
 "La apriora estas ~/"
 
-#: src/LYrcFile.c:372
+#: src/LYrcFile.c:374
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5669,7 +5765,7 @@ msgstr ""
 "kun nevalidaj atributoj vojon kaj domajnon. Ĉiuj domajnoj aŭtomate demandos\n"
 "al la uzanto pri nevalida vojo aŭ domajno.\n"
 
-#: src/LYrcFile.c:386
+#: src/LYrcFile.c:388
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
@@ -5677,7 +5773,7 @@ msgstr ""
 "dir_list_order specifas la dosierujlistan ordon de DIRED_SUPPORT\n"
 "(se realigita). La apriora estas \"ORDER_BY_NAME\"\n"
 
-#: src/LYrcFile.c:391
+#: src/LYrcFile.c:393
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5689,7 +5785,7 @@ msgstr ""
 "dosieroj kaj dosierujoj. \"FILES_FIRST\" listigas dosierojn antaŭ aliaj\n"
 "kaj \"DIRECTORIES_FIRST\" listigas dosierujojn antaŭ aliaj.\n"
 
-#: src/LYrcFile.c:399
+#: src/LYrcFile.c:401
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5701,7 +5797,7 @@ msgstr ""
 "  ^B = maldekstren  ^F = dekstren\n"
 "estos aktivaj.\n"
 
-#: src/LYrcFile.c:405
+#: src/LYrcFile.c:407
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5709,11 +5805,11 @@ msgid ""
 "will be used for sending mail.\n"
 msgstr ""
 "file_editor specifas la tekstoredaktilon plenumontan por redakti lokajn dosierojn\n"
-"aŭ sendi retleterojn. So neniu estas specifita, do redakti dosierojn estos malebligitaj\n"
+"aŭ sendi retleterojn. So neniu estas specifita, do redakti dosierojn estos malaktivigitaj\n"
 "se ĝi ne estas aktivigita laŭ la komanda linio, kaj la integra liniredaktilo\n"
 "estos uzata por sendi retleterojn.\n"
 
-#: src/LYrcFile.c:412
+#: src/LYrcFile.c:414
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5729,7 +5825,7 @@ msgstr ""
 "   BY_SIZE     -- ordigas laŭ dosiergrando\n"
 "   BY_DATE     -- ordigas laŭ dosierdato\n"
 
-#: src/LYrcFile.c:435
+#: src/LYrcFile.c:437
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5743,9 +5839,9 @@ msgid ""
 "\n"
 "Current lineedit modes are:\n"
 msgstr ""
-"line_mode specifas la klavojn uzi por enmeti ĉenojn en\n"
+"line_mode specifas la klavojn uzeblajn por enmeti ĉenojn en\n"
 "demandiloj kaj formularoj. Se linedit_mode estas \"Default Binding\",\n"
-"la sekvaj stirsignoj estas uzatoj por movi kaj forigi:\n"
+"la jenaj stirsignoj estas uzeblaj por movi kaj forigi:\n"
 "\n"
 "                Antaŭa Sekva      Enen-klavon = Akcepti enmeton\n"
 "   Movi signon: <-      ->        ^G          = Nuligi enmeton\n"
@@ -5753,9 +5849,9 @@ msgstr ""
 " Forigi signon: ^H      ^R        ^A          = Komenco de linio\n"
 " Forigi vorton: ^B      ^F        ^E          = Fino de linio\n"
 "\n"
-"Aktuale reĝimoj linio-redaktantaj estas:\n"
+"Nune reĝimoj linio-redaktantaj estas:\n"
 
-#: src/LYrcFile.c:453
+#: src/LYrcFile.c:455
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5767,7 +5863,7 @@ msgstr ""
 "Maksimume 26 legosignaj dosieroj (por la askiaj ĉefliteroj) estas permesitaj.\n"
 "Oni komencas kun \"multi_bookmarkB\" pro tio, ke 'A' estas la ĉefa (vidu supran).\n"
 
-#: src/LYrcFile.c:459
+#: src/LYrcFile.c:461
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5785,7 +5881,7 @@ msgstr ""
 "Vi ankaŭ povas restigi ĉi tiun kampo vaka, sed se vi faras tion, via\n"
 "retpoŝtadreso ne aŭtomate uziĝos en viaj retleteroj.\n"
 
-#: src/LYrcFile.c:468
+#: src/LYrcFile.c:470
 msgid ""
 "personal_mail_name specifies your personal name, for mail.  The\n"
 "name is sent for mailed comments.  Lynx will prompt for this,\n"
@@ -5797,15 +5893,15 @@ msgid ""
 "menu, or modify this file directly.\n"
 msgstr ""
 "personal_mail_name specifas vian propran nomon, por retpoŝto. La\n"
-"nomo estas sendita por retleteroj. Linko demandos por tio,\n"
+"nomo estas sendita por retleteroj. Lynx demandos por tio,\n"
 "montrante la agorditan valoron aŭtomate dum sendi retleterojn.\n"
 "Ĉi tio ne estas nepre la sama kiel la nomo provizita kiel parto de la\n"
 "personal_mail_address.\n"
-"Linko ne devos konservi viajn ŝanĝojn al tiu valoro kiel kromefiko\n"
-"de sendi retleterojn. Aktualigi la aŭtomatan valorono, vi devas uzi la agordojn\n"
+"Lynx ne devos konservi viajn ŝanĝojn al tiu valoro kiel kromefiko\n"
+"de sendi retleterojn. Por ĝisdatigi la aŭtomatan valorono, vi devas uzi la agordojn\n"
 "aŭ modifi ĉi tiun dosieron permane.\n"
 
-#: src/LYrcFile.c:478
+#: src/LYrcFile.c:480
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5821,11 +5917,11 @@ msgid ""
 "is also allowed.\n"
 msgstr ""
 "preferred_charset specifas la kodoprezenton laŭ MIME-notacio (ekzemple\n"
-"ISO-8859-2, ISO-8859-5), kion Linko indikos preferita en petoj\n"
+"ISO-8859-2, ISO-8859-5), kion Lynx indikos preferita en petoj\n"
 "al HTTP-serviloj uzante la kapon Accept-Charset. La valoro ne inkluzivu\n"
 "la kodoprezentojn ISO-8859-1 aŭ US-ASCII pro tio, ke tiuj valoroj jam estas\n"
 "aŭtomate supozitaj. Povas esti listo apartigitaj per komoj.\n"
-"Se dosiero laŭ tiu kodoprezento estas havebla, la servilo sendos ĝin.\n"
+"Se dosiero laŭ tiu kodoprezento estas disponebla, la servilo sendos ĝin.\n"
 "Se neniu kapo Accept-Charset estas ĉeesta, la aŭtomata valoro estas ĉia\n"
 "kodoprezento aprobinda. Se kapo Accept-Charset ĉeestas,\n"
 "kaj se la servilo ne eblas sendi respondon, kiu estas aprobinda\n"
@@ -5833,7 +5929,7 @@ msgstr ""
 "kvankam sendi malaprobindan respondon\n"
 "ankaŭ estas permesata.\n"
 
-#: src/LYrcFile.c:494
+#: src/LYrcFile.c:496
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5843,11 +5939,11 @@ msgid ""
 msgstr ""
 "preferred_language specifas la lingvon laŭ MIME-notacio (ekzemple en,\n"
 "fr, povas esti listo, apartigita per komoj, laŭ prefero)\n"
-"kion Linko indikos, ke vi preferas en petoj al HTTP-serviloj.\n"
-"Se dosiero en tiu lingvo estas havebla, la servilo sendos ĝin.\n"
+"kion Lynx indikos, ke vi preferas en petoj al HTTP-serviloj.\n"
+"Se dosiero en tiu lingvo estas disponebla, la servilo sendos ĝin.\n"
 "Aliokaze la servilo sendos la dosieron en sia apriora lingvo.\n"
 
-#: src/LYrcFile.c:505
+#: src/LYrcFile.c:507
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5869,7 +5965,7 @@ msgstr ""
 "aŭ kompromiti sekurecon. Nur elektu la valoron \"on\",\n"
 "se vi vidas informojn el tute fidindaj fontoj.\n"
 
-#: src/LYrcFile.c:516
+#: src/LYrcFile.c:518
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5897,7 +5993,7 @@ msgstr ""
 "aŭ kompromiti sekurecon. Nur elektu la valoron \"on\",\n"
 "se vi vidas informojn el tute fidindaj fontoj.\n"
 
-#: src/LYrcFile.c:534
+#: src/LYrcFile.c:536
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5907,15 +6003,15 @@ msgid ""
 "as the default while a value of \"off\" will set use of radio boxes.\n"
 "The default can be overridden via the -popup command line toggle.\n"
 msgstr ""
-"select_popups specifas ĉu la elektoj en elektiloj, kiuj\n"
+"select_popups specifas ĉu la elektoj en elekto-listoj, kiuj\n"
 "povas havi nur unu elekton, estas prezentitaj kiel vertikala listo da\n"
 "radiobutonoj aŭ ŝprucmenuo. Notu, ke se la elekto permesas plurajn elektojn,\n"
-"Linko ĉiam kreos vertikalan liston de markobutonoj por la elektoj.\n"
+"Lynx ĉiam kreos vertikalan liston de markobutonoj por la elektoj.\n"
 "Valoro de \"on\" specifas, ke aro da ŝprucmenuoj estas preferataj.\n"
 "Valoro de \"off\" specifas, ke aro da radiobutonoj estas preferataj.\n"
 "La aŭtomatan valoron oni povas nuligi per la komandlinian parametron -popup.\n"
 
-#: src/LYrcFile.c:545
+#: src/LYrcFile.c:547
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5937,7 +6033,7 @@ msgstr ""
 "\"never\" devigos kolorreĝimon malŝaltita (trakti la terminalon kiel unukoloran)\n"
 "dum plenumo, eĉ se la terminalo ŝajnas esti plurkolora. Valoro de\n"
 "\"always\" devigos kolorreĝimon ŝaltita eĉ se la terminalo ŝajnas esti\n"
-"unuklora, se tio estas regata de la biblioteko uzata por munti Linkon.\n"
+"unuklora, se tio estas regata de la biblioteko uzata por munti Lynx-on.\n"
 "Valoro de \"default\" cedos la konduton de supozado\n"
 "unukolora terminalo se kolora kapablo ne estas decidita dum plenumo\n"
 "bazita sur la terminala tipo, aŭ la komandlinia parametro -color, aŭ\n"
@@ -5949,7 +6045,7 @@ msgstr ""
 "la agordoj. Se la agordaĵoj estas konservitaj, la agordaĵoj \"on\" kaj \"off\"\n"
 "agordaĵoj de \"montri kolorojn\" estos traktitaj same al \"default\".\n"
 
-#: src/LYrcFile.c:562
+#: src/LYrcFile.c:564
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5963,7 +6059,7 @@ msgid ""
 msgstr ""
 "show_cursor specifas ĉu 'kaŝi' la kursoron ĉe la dekstro (kaj\n"
 "subo, se eble) de la ekrano, aŭ meti ĝin ĉe la maldekstro de la\n"
-"nuna ligilo en dokumentoj, aŭ nuna elekto en elektilo.\n"
+"nuna ligilo en dokumentoj, aŭ nuna elekto en elekto-listo.\n"
 "Meti la kursoron ĉe la maldekstro de la nuna ligilo aŭ elekto estas\n"
 "helpa por parolaj kaj brajlaj fasadoj, kaj kiam la terminalo estas\n"
 "tia, kia ne distingas la nunan ligilon bazita sur prilumado\n"
@@ -5971,7 +6067,7 @@ msgstr ""
 "La valoro de \"off\" metos la kursoron 'kaŝanta'.\n"
 "La aŭtomatan valoron oni povas nuligi per la komandlinia parametro -show_cursor.\n"
 
-#: src/LYrcFile.c:573
+#: src/LYrcFile.c:575
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5981,11 +6077,11 @@ msgid ""
 msgstr ""
 "show_dotfiles specifas, ke la dosierujlisto inkluzivu\n"
 "\"kaŝatajn\" (punktajn) dosier(uj)ojn. Valoro de \"on\" estos\n"
-"obeataj nur se ebligitaj per userdefs.h kajaŭ lynx.cfg, kaj ne\n"
+"obeataj nur se aktivigitaj per userdefs.h kajaŭ lynx.cfg, kaj ne\n"
 "malŝaltita per komandlinia parametro. Se montrado de kaŝataj dosieroj\n"
-"estas malebligita, kredado de tiaj dosieroj en Linko ankaŭ estas malebligita.\n"
+"estas malaktivigita, kredado de tiaj dosieroj en Lynx ankaŭ estas malaktivigita.\n"
 
-#: src/LYrcFile.c:584
+#: src/LYrcFile.c:586
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -6000,14 +6096,14 @@ msgstr ""
 "Se sub_bookmarks ne havas valoron de \"off\", kaj pluraj legosignaj dosieroj\n"
 "estis difinitaj (vidu sube), do ĉiuj legosignaj operacioj unue demandos\n"
 "ke la uzanto elektu aktiva sublegosigna dosiero. Se la aŭtomata\n"
-"Linko-bookmark_file estas difinita (vidu supre), ĝi estos uzita kiel la\n"
+"Lynx-bookmark_file estas difinita (vidu supre), ĝi estos uzita kiel la\n"
 "aŭtomata elekto. Kiam la valoro de tiu agordaĵo estas \"advanced\", kaj la\n"
 "uzantoreĝimo estas altnivela, la komandon \"'v'idi legosignojn\" kreos\n"
 "statlinian demandilon anstataŭ la menuo vidata en la uzantoreĝimoj novula kaj meznivela\n"
 "Kiam tiu elekto estas \"standard\", la menuo estos\n"
 "prezentita senkonsidere de uzantoreĝimo.\n"
 
-#: src/LYrcFile.c:598
+#: src/LYrcFile.c:600
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6019,20 +6115,20 @@ msgstr ""
 "user_mode specifas la scinivelon de la uzanto. La aŭtomata valoro\n"
 "estas \"NOVICE\", kiu montras du aldonajn liniojn de helpo ĉe la\n"
 "malsupro de la ekrano por helpi la uzanton lerni la fundamentajn\n"
-"komandoj de Linko. Valoro de \"INTERMEDIATE\" malŝaltas la aldonajn\n"
-"informojn. \"Advanced\" montras la retadreson de la nuna ligilo ĉe la\n"
+"komandoj de Lynx. Valoro de \"INTERMEDIATE\" malŝaltas la aldonajn\n"
+"informojn. \"Advanced\" montras la URL-on de la nuna ligilo ĉe la\n"
 "malsupro de la ekrano.\n"
 
-#: src/LYrcFile.c:607
+#: src/LYrcFile.c:609
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
 "See also VERBOSE_IMAGES in lynx.cfg\n"
 msgstr ""
-"Se la valoro de verbose_images estas \"on\", Linko montros la dosiernomo\n"
-"de la bildon anstataŭ [INLINE], [LINK], aŭ [IMAGE]\n"
+"Se la valoro de verbose_images estas \"on\", Lynx montros la dosiernomon\n"
+"de la bildo anstataŭ ĉenon [INLINE], [LINK], aŭ [IMAGE]\n"
 
-#: src/LYrcFile.c:612
+#: src/LYrcFile.c:614
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -6048,15 +6144,15 @@ msgstr ""
 "Majusklaj 'H', 'J' kaj 'K' malgraŭe aktivigos helpon, ŝaltojn,\n"
 "kaj la klavomapon, respektive.\n"
 
-#: src/LYrcFile.c:620
+#: src/LYrcFile.c:622
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
-"La agordaĵo visited_links regas, kiel Linko organizas la informojn\n"
+"La agordaĵo visited_links regas, kiel Lynx organizas la informojn\n"
 "en la paĝo 'Vizititaj Ligiloj'.\n"
 
-#: src/LYrcFile.c:845
+#: src/LYrcFile.c:863
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -6070,9 +6166,9 @@ msgstr ""
 "via cifera klavaro (kiam aktiva) kondutos kiel sagoklavoj:\n"
 "            8 = Supra\n"
 "  4 = Maldekstra    6 = Dekstra\n"
-"            2 = Suba\n"
+"            2 = Malsupra\n"
 
-#: src/LYrcFile.c:854
+#: src/LYrcFile.c:872
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
@@ -6080,7 +6176,7 @@ msgstr ""
 "Se la valoro de keypad_mode estas \"LINKS_ARE_NUMBERED\", do ciferoj\n"
 "aperos apud ĉiu ligilo kaj ciferoj uziĝos por elekti ligilojn.\n"
 
-#: src/LYrcFile.c:858
+#: src/LYrcFile.c:876
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6093,40 +6189,40 @@ msgstr ""
 "Se la valoro de keypad_mode estas \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\",\n"
 "ciferoj aperos apud ĉiu ligilo kaj videbla formulara kampo.\n"
 "Ciferoj estas uzitaj por elekti ligilojn, aŭ movi la \"nunan ligilon\" al\n"
-"formulara kampo aŭ butono. Aldone elektoj en elektiloj estas indicitaj\n"
+"formulara kampo aŭ butono. Aldone elektoj en elekto-listoj estas indicitaj\n"
 "por ke la uzanto povu tajpi elektan ciferon por elekti elekton en\n"
 "ŝprucmenuoj, eĉ se la elekto ne estas videbla sur la ekrano. Referencaj\n"
 "listoj kaj eligoj de la lista komando ankaŭ nombras formularajn aĵojn.\n"
 
-#: src/LYrcFile.c:867
+#: src/LYrcFile.c:885
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
 "enabled.\n"
 msgstr ""
-"NOTE: Iuj firmaj dokumentoj eble aspektos malbone formitaj kiam\n"
+"NOTO: Iuj fikse formatitaj dokumentoj eble aspektos fuŝformitaj kiam\n"
 "\"LINKS_ARE_NUMBERED\" aŭ \"LINKS_AND_FORM_FIELDS\" estas\n"
 "aktivaj.\n"
 
-#: src/LYrcFile.c:899
+#: src/LYrcFile.c:917
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
 msgstr ""
-"Dosiero pri propraj agordaĵoj de Linko-uzanto\n"
+"Dosiero pri propraj agordaĵoj de Lynx-uzanto\n"
 "\n"
 
-#: src/LYrcFile.c:908
+#: src/LYrcFile.c:926
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
 "checkbox:\n"
 msgstr ""
-"Ĉi tiu dosiero enhavas agordaĵojn konservitajn de la agordilo de Linko\n"
+"Ĉi tiu dosiero enhavas agordaĵojn konservitajn de la agordilo de Lynx\n"
 "(ordinare per la klavo 'o'). Por konservi agordaĵojn en tio, oni devas elekti la\n"
 "markobutonon:\n"
 
-#: src/LYrcFile.c:915
+#: src/LYrcFile.c:933
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
@@ -6134,7 +6230,7 @@ msgstr ""
 "Vi devas poste konservi la agordaĵojn per la ligilo en la linio supra\n"
 "al la markobutono:\n"
 
-#: src/LYrcFile.c:922
+#: src/LYrcFile.c:940
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
@@ -6144,17 +6240,17 @@ msgstr ""
 "montras la pli mallongan menuon. Konservi agordaĵojn per la klavo '>'.\n"
 "\n"
 
-#: src/LYrcFile.c:929
+#: src/LYrcFile.c:947
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
 "\n"
 msgstr ""
-"Ĉi tiu dosiero enhavas agordaĵojn konservitajn el la agordilo de Linko\n"
+"Ĉi tiu dosiero enhavas agordaĵojn konservitajn el la agordilo de Lynx\n"
 "(ordinare per la klavo '>').\n"
 "\n"
 
-#: src/LYrcFile.c:936
+#: src/LYrcFile.c:954
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6174,17 +6270,20 @@ msgstr ""
 "nomiĝas \"lynx.cfg\". Ĝi havas malsaman enhavon kaj formaton.\n"
 "Ĝi ne estas ĉi tiu dosiero.\n"
 
-#~ msgid "Current Edit-Key Map"
-#~ msgstr "Nuna redaktoklavomapo"
+#~ msgid "User/password may appear to be a hostname: '%s' (e.g, '%s')"
+#~ msgstr "Salutnomo/pasvorto eble aspektas kvazaŭ retnodnomo: '%s' (ekz-e ('%s')"
+
+#~ msgid "User/password contains only punctuation: %s"
+#~ msgstr "Salutnomo/pasvorto enhavas nur interpunkcion: %s"
 
-#~ msgid "Terminal reinitialisation failed - unknown terminal type?"
-#~ msgstr "Terminala restartigo malsukcesis - ĉu nekonata terminala tipo?"
+#~ msgid "User/password may be confused with hostname: '%s' (e.g, '%s')"
+#~ msgstr "Salutnomo/pasvorton konfuzeblas kun retnodnomon: '%s' (ekz-e '%s')"
 
-#~ msgid "Show %s/sec (2-digits), ETA"
-#~ msgstr "Montru aproksimatan %sn en sekundo (duciferan)"
+#~ msgid "HTTP 1.0"
+#~ msgstr "HTTP/1.0"
 
-#~ msgid "Color style"
-#~ msgstr "Kolora stilo"
+#~ msgid "HTTP 1.1"
+#~ msgstr "HTTP/1.1"
 
-#~ msgid "Default colors"
-#~ msgstr "Aprioraj koloroj"
+#~ msgid "HTTP protocol"
+#~ msgstr "HTTP-protokolo"
diff --git a/po/lynx.pot b/po/lynx.pot
index 4368794..1880a1b 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -1,9 +1,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.9dev.10\n"
+"Project-Id-Version: lynx 2.8.9dev.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-04 13:30-0400\n"
+"POT-Creation-Date: 2017-07-04 16:51-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2332,7 +2332,7 @@ msgstr ""
 msgid "(No value.)"
 msgstr ""
 
-#: LYMessages.c:743 src/LYOptions.c:2428
+#: LYMessages.c:743 src/LYOptions.c:2446
 msgid "None"
 msgstr ""
 
@@ -2846,38 +2846,42 @@ msgstr ""
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr ""
 
-#.
-#. * Set up the message for the username prompt, and then issue the
-#. * prompt.  The default username is included in the call to the
-#. * prompting function, but the password is NULL-ed and always replaced.
-#. * - FM
-#.
-#: WWW/Library/Implementation/HTAABrow.c:634
+#: WWW/Library/Implementation/HTAABrow.c:569
+#, c-format
+msgid "username for realm %s changed from %s to %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:585
+#, c-format
+msgid "password for realm %s user %s changed"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:697
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:904
+#: WWW/Library/Implementation/HTAABrow.c:970
 msgid ""
 "This client doesn't know how to compose proxy authorization information for "
 "scheme"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:983
+#: WWW/Library/Implementation/HTAABrow.c:1047
 msgid ""
 "This client doesn't know how to compose authorization information for scheme"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1094
+#: WWW/Library/Implementation/HTAABrow.c:1156
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1200
+#: WWW/Library/Implementation/HTAABrow.c:1260
 msgid "Proxy authorization required -- retrying"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1256
+#: WWW/Library/Implementation/HTAABrow.c:1316
 msgid "Access without authorization denied -- retrying"
 msgstr ""
 
@@ -2893,7 +2897,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8874
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8865
 msgid "Loading incomplete."
 msgstr ""
 
@@ -2918,7 +2922,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8075
 msgid "Can't Access"
 msgstr ""
 
@@ -2926,37 +2930,37 @@ msgstr ""
 msgid "Unable to access document."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:875
+#: WWW/Library/Implementation/HTFTP.c:870
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:903
+#: WWW/Library/Implementation/HTFTP.c:898
 msgid "Unable to connect to FTP host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:1142
+#: WWW/Library/Implementation/HTFTP.c:1137
 msgid "close master socket"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:1204
+#: WWW/Library/Implementation/HTFTP.c:1199
 msgid "socket for master socket"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:2952
+#: WWW/Library/Implementation/HTFTP.c:2948
 msgid "Receiving FTP directory."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3086
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:3448
+#: WWW/Library/Implementation/HTFTP.c:3444
 msgid "connect for data"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:4120
+#: WWW/Library/Implementation/HTFTP.c:4126
 msgid "Receiving FTP file."
 msgstr ""
 
@@ -3108,8 +3112,8 @@ msgstr ""
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1845
-#: WWW/Library/Implementation/HTTCP.c:1863
+#: WWW/Library/Implementation/HTTCP.c:1839
+#: WWW/Library/Implementation/HTTCP.c:1857
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3118,39 +3122,39 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1860
+#: WWW/Library/Implementation/HTTCP.c:1854
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1874
+#: WWW/Library/Implementation/HTTCP.c:1868
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1885
+#: WWW/Library/Implementation/HTTCP.c:1879
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1899
+#: WWW/Library/Implementation/HTTCP.c:1893
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1923
+#: WWW/Library/Implementation/HTTCP.c:1917
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1991
+#: WWW/Library/Implementation/HTTCP.c:1985
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2180
+#: WWW/Library/Implementation/HTTCP.c:2174
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2248
+#: WWW/Library/Implementation/HTTCP.c:2242
 msgid "Socket read failed (too many tries)."
 msgstr ""
 
@@ -3159,110 +3163,105 @@ msgstr ""
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:584
+#: WWW/Library/Implementation/HTTP.c:629
 #, c-format
 msgid "User/password contains only punctuation: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:588
+#: WWW/Library/Implementation/HTTP.c:633
 #, c-format
 msgid "User/password may be confused with hostname: '%s' (e.g, '%s')"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:592
-#, c-format
-msgid "User/password may appear to be a hostname: '%s' (e.g, '%s')"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:650
+#: WWW/Library/Implementation/HTTP.c:694
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:837
+#: WWW/Library/Implementation/HTTP.c:881
 msgid "This client does not contain support for HTTPS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:862
+#: WWW/Library/Implementation/HTTP.c:906
 msgid "Unable to connect to remote host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:905
+#: WWW/Library/Implementation/HTTP.c:953
 msgid "Retrying connection without TLS."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:957
+#: WWW/Library/Implementation/HTTP.c:1005
 msgid "GnuTLS error when trying to verify certificate."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:970
+#: WWW/Library/Implementation/HTTP.c:1018
 msgid "the certificate has no known issuer"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:972
+#: WWW/Library/Implementation/HTTP.c:1020
 msgid "no issuer was found"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:974
+#: WWW/Library/Implementation/HTTP.c:1022
 msgid "issuer is not a CA"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:976
+#: WWW/Library/Implementation/HTTP.c:1024
 msgid "the certificate has been revoked"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:978
+#: WWW/Library/Implementation/HTTP.c:1026
 msgid "the certificate is not trusted"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1053
+#: WWW/Library/Implementation/HTTP.c:1101
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1103
-#: WWW/Library/Implementation/HTTP.c:1145
+#: WWW/Library/Implementation/HTTP.c:1151
+#: WWW/Library/Implementation/HTTP.c:1193
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1175
+#: WWW/Library/Implementation/HTTP.c:1223
 msgid "Can't find common name in certificate"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1178
+#: WWW/Library/Implementation/HTTP.c:1226
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1185
+#: WWW/Library/Implementation/HTTP.c:1233
 msgid "SSL error"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1193
+#: WWW/Library/Implementation/HTTP.c:1241
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1202
+#: WWW/Library/Implementation/HTTP.c:1250
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1670
+#: WWW/Library/Implementation/HTTP.c:1718
 msgid "Sending HTTP request."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1712
+#: WWW/Library/Implementation/HTTP.c:1760
 msgid "Unexpected network write error; connection aborted."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1718
+#: WWW/Library/Implementation/HTTP.c:1766
 msgid "HTTP request sent; waiting for response."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1791
-#: WWW/Library/Implementation/HTTP.c:1801
+#: WWW/Library/Implementation/HTTP.c:1839
+#: WWW/Library/Implementation/HTTP.c:1849
 msgid "Unexpected network read error; connection aborted."
 msgstr ""
 
@@ -3275,7 +3274,7 @@ msgstr ""
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2003
+#: WWW/Library/Implementation/HTTP.c:2051
 msgid "Got unexpected Informational Status."
 msgstr ""
 
@@ -3285,7 +3284,7 @@ msgstr ""
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2037
+#: WWW/Library/Implementation/HTTP.c:2085
 msgid "Request fulfilled.  Reset Content."
 msgstr ""
 
@@ -3295,27 +3294,27 @@ msgstr ""
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2154
+#: WWW/Library/Implementation/HTTP.c:2202
 msgid "Got unexpected 304 Not Modified status."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2217
+#: WWW/Library/Implementation/HTTP.c:2265
 msgid "Redirection of POST content requires user approval."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2232
+#: WWW/Library/Implementation/HTTP.c:2280
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2276
+#: WWW/Library/Implementation/HTTP.c:2326
 msgid "Retrying with access authorization information."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2288
+#: WWW/Library/Implementation/HTTP.c:2338
 msgid "Show the 401 message body?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2332
+#: WWW/Library/Implementation/HTTP.c:2382
 msgid "Show the 407 message body?"
 msgstr ""
 
@@ -3323,7 +3322,7 @@ msgstr ""
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2432
+#: WWW/Library/Implementation/HTTP.c:2482
 msgid "Unknown status reply from server!"
 msgstr ""
 
@@ -3509,98 +3508,98 @@ msgstr ""
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr ""
 
-#: src/GridText.c:3674
+#: src/GridText.c:3666
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr ""
 
-#: src/GridText.c:6152
+#: src/GridText.c:6144
 msgid "text entry field"
 msgstr ""
 
-#: src/GridText.c:6155
+#: src/GridText.c:6147
 msgid "password entry field"
 msgstr ""
 
-#: src/GridText.c:6158
+#: src/GridText.c:6150
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:6161
+#: src/GridText.c:6153
 msgid "radio button"
 msgstr ""
 
-#: src/GridText.c:6164
+#: src/GridText.c:6156
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:6167
+#: src/GridText.c:6159
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:6170
+#: src/GridText.c:6162
 msgid "script button"
 msgstr ""
 
-#: src/GridText.c:6173
+#: src/GridText.c:6165
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:6176
+#: src/GridText.c:6168
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:6179
+#: src/GridText.c:6171
 msgid "text entry area"
 msgstr ""
 
-#: src/GridText.c:6182
+#: src/GridText.c:6174
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:6185
+#: src/GridText.c:6177
 msgid "file entry field"
 msgstr ""
 
-#: src/GridText.c:6188
+#: src/GridText.c:6180
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:6191
+#: src/GridText.c:6183
 msgid "image-submit button"
 msgstr ""
 
-#: src/GridText.c:6194
+#: src/GridText.c:6186
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:6197
+#: src/GridText.c:6189
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
+#: src/GridText.c:6209 src/GridText.c:6216 src/LYList.c:249
 msgid "unknown field or link"
 msgstr ""
 
-#: src/GridText.c:10649
+#: src/GridText.c:10633
 msgid "Can't open file for uploading"
 msgstr ""
 
-#: src/GridText.c:11842
+#: src/GridText.c:11821
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12918
+#: src/GridText.c:12891
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:13082
+#: src/GridText.c:13050
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:13718
+#: src/GridText.c:13680
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3690,27 +3689,27 @@ msgstr ""
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:940
+#: src/HTAlert.c:938
 msgid "Y/N/A/V"
 msgstr ""
 
-#: src/HTML.c:5931
+#: src/HTML.c:5932
 msgid "Description:"
 msgstr ""
 
-#: src/HTML.c:5936
+#: src/HTML.c:5937
 msgid "(none)"
 msgstr ""
 
-#: src/HTML.c:5940
+#: src/HTML.c:5941
 msgid "Filepath:"
 msgstr ""
 
-#: src/HTML.c:5946
+#: src/HTML.c:5947
 msgid "(unknown)"
 msgstr ""
 
-#: src/HTML.c:7386
+#: src/HTML.c:7387
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
@@ -3763,7 +3762,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr ""
 
-#: src/LYCgi.c:162
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3772,23 +3771,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:277
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr ""
 
-#: src/LYCgi.c:711 src/LYCgi.c:714
+#: src/LYCgi.c:709 src/LYCgi.c:712
 msgid "Good Advice"
 msgstr ""
 
-#: src/LYCgi.c:718
+#: src/LYCgi.c:716
 msgid "An excellent http server for VMS is available via"
 msgstr ""
 
-#: src/LYCgi.c:725
+#: src/LYCgi.c:723
 msgid "this link"
 msgstr ""
 
-#: src/LYCgi.c:729
+#: src/LYCgi.c:727
 msgid "It provides state of the art CGI script support.\n"
 msgstr ""
 
@@ -3796,19 +3795,19 @@ msgstr ""
 msgid "Exiting via interrupt:"
 msgstr ""
 
-#: src/LYCookie.c:2541
+#: src/LYCookie.c:2537
 msgid "(from a previous session)"
 msgstr ""
 
-#: src/LYCookie.c:2602
+#: src/LYCookie.c:2598
 msgid "Maximum Gobble Date:"
 msgstr ""
 
-#: src/LYCookie.c:2641
+#: src/LYCookie.c:2637
 msgid "Internal"
 msgstr ""
 
-#: src/LYCookie.c:2642
+#: src/LYCookie.c:2638
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
@@ -3820,34 +3819,34 @@ msgstr ""
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1863
+#: src/LYCurses.c:1869
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1867
+#: src/LYCurses.c:1873
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr ""
 
-#: src/LYCurses.c:1916
+#: src/LYCurses.c:1922
 msgid "Your Terminal type is unknown!"
 msgstr ""
 
-#: src/LYCurses.c:1917
+#: src/LYCurses.c:1923
 msgid "Enter a terminal type:"
 msgstr ""
 
-#: src/LYCurses.c:1931
+#: src/LYCurses.c:1937
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:2483
+#: src/LYCurses.c:2491
 #, c-format
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 
-#: src/LYCurses.c:2486
+#: src/LYCurses.c:2494
 #, c-format
 msgid ""
 "\n"
@@ -3908,31 +3907,31 @@ msgstr ""
 msgid "No Name Given"
 msgstr ""
 
-#: src/LYHistory.c:680
+#: src/LYHistory.c:676
 msgid "You selected:"
 msgstr ""
 
-#: src/LYHistory.c:704 src/LYHistory.c:933
+#: src/LYHistory.c:700 src/LYHistory.c:929
 msgid "(no address)"
 msgstr ""
 
-#: src/LYHistory.c:708
+#: src/LYHistory.c:704
 msgid " (internal)"
 msgstr ""
 
-#: src/LYHistory.c:710
+#: src/LYHistory.c:706
 msgid " (was internal)"
 msgstr ""
 
-#: src/LYHistory.c:808
+#: src/LYHistory.c:804
 msgid " (From History)"
 msgstr ""
 
-#: src/LYHistory.c:853
+#: src/LYHistory.c:849
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr ""
 
-#: src/LYHistory.c:1155
+#: src/LYHistory.c:1151
 msgid "(No messages yet)"
 msgstr ""
 
@@ -4272,7 +4271,7 @@ msgstr ""
 msgid "Installation complete"
 msgstr ""
 
-#: src/LYLocal.c:2680
+#: src/LYLocal.c:2678
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
@@ -4311,19 +4310,19 @@ msgstr ""
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1073
+#: src/LYMain.c:1074
 msgid "No Winsock found, sorry."
 msgstr ""
 
-#: src/LYMain.c:1264
+#: src/LYMain.c:1265
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr ""
 
-#: src/LYMain.c:1317 src/LYMainLoop.c:5283
+#: src/LYMain.c:1318 src/LYMainLoop.c:5284
 msgid "No such directory"
 msgstr ""
 
-#: src/LYMain.c:1511
+#: src/LYMain.c:1512
 #, c-format
 msgid ""
 "\n"
@@ -4331,7 +4330,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1521
+#: src/LYMain.c:1522
 #, c-format
 msgid ""
 "\n"
@@ -4339,68 +4338,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1677
+#: src/LYMain.c:1678
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1679
+#: src/LYMain.c:1680
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1837
+#: src/LYMain.c:1838
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2407
+#: src/LYMain.c:2408
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2644 src/LYMain.c:2689
+#: src/LYMain.c:2645 src/LYMain.c:2690
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3208
+#: src/LYMain.c:3209
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 
-#: src/LYMain.c:3249
+#: src/LYMain.c:3250
 #, c-format
 msgid "Built on %s%s.\n"
 msgstr ""
 
-#: src/LYMain.c:3263
+#: src/LYMain.c:3264
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3264
+#: src/LYMain.c:3265
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3265
+#: src/LYMain.c:3266
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr ""
 
-#: src/LYMain.c:3266
+#: src/LYMain.c:3267
 msgid ""
 "See http://lynx.invisible-island.net/ and the online help for more "
 "information."
 msgstr ""
 
-#: src/LYMain.c:4109
+#: src/LYMain.c:4118
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:4110
+#: src/LYMain.c:4119
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4413
+#: src/LYMain.c:4422
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -4410,7 +4409,7 @@ msgstr ""
 msgid "Internal error: Invalid mouse link %d!"
 msgstr ""
 
-#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5306
 msgid "A URL specified by the user"
 msgstr ""
 
@@ -4429,89 +4428,89 @@ msgstr ""
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3575
+#: src/LYMainLoop.c:3576
 #, c-format
 msgid "Query parameter %d: "
 msgstr ""
 
-#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
+#: src/LYMainLoop.c:3805 src/LYMainLoop.c:5582
 msgid "Entry into main screen"
 msgstr ""
 
-#: src/LYMainLoop.c:4062
+#: src/LYMainLoop.c:4063
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4357
+#: src/LYMainLoop.c:4358
 msgid "charset for this document specified explicitly, sorry..."
 msgstr ""
 
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5264
 msgid "cd to:"
 msgstr ""
 
-#: src/LYMainLoop.c:5286
+#: src/LYMainLoop.c:5287
 msgid "A component of path is not a directory"
 msgstr ""
 
-#: src/LYMainLoop.c:5289
+#: src/LYMainLoop.c:5290
 msgid "failed to change directory"
 msgstr ""
 
-#: src/LYMainLoop.c:6515
+#: src/LYMainLoop.c:6516
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6809
+#: src/LYMainLoop.c:6810
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:7151
+#: src/LYMainLoop.c:7152
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:7154
+#: src/LYMainLoop.c:7155
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:7234
+#: src/LYMainLoop.c:7235
 msgid "Current URL is empty."
 msgstr ""
 
-#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
+#: src/LYMainLoop.c:7237 src/LYUtils.c:1915
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:7238
+#: src/LYMainLoop.c:7239
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7240
+#: src/LYMainLoop.c:7241
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7267
+#: src/LYMainLoop.c:7268
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
+#: src/LYMainLoop.c:7961 src/LYMainLoop.c:8132
 msgid "-index-"
 msgstr ""
 
-#: src/LYMainLoop.c:8069
+#: src/LYMainLoop.c:8070
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:8081
+#: src/LYMainLoop.c:8082
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:8082
+#: src/LYMainLoop.c:8083
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:8125
+#: src/LYMainLoop.c:8126
 msgid "-more-"
 msgstr ""
 
@@ -4576,8 +4575,10 @@ msgid "ON"
 msgstr ""
 
 #. verbose_img variable
+#. LYCollapseBRs variable
+#. LYtrimBlankLines variable
 #: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2306
-#: src/LYOptions.c:2317
+#: src/LYOptions.c:2315 src/LYOptions.c:2324 src/LYOptions.c:2335
 msgid "OFF"
 msgstr ""
 
@@ -4718,235 +4719,243 @@ msgstr ""
 msgid "show filename"
 msgstr ""
 
-#: src/LYOptions.c:2318
+#: src/LYOptions.c:2316
+msgid "collapse"
+msgstr ""
+
+#: src/LYOptions.c:2325
+msgid "trim-lines"
+msgstr ""
+
+#: src/LYOptions.c:2336
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2319
+#: src/LYOptions.c:2337
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2353
+#: src/LYOptions.c:2371
 msgid "Directories first"
 msgstr ""
 
-#: src/LYOptions.c:2354
+#: src/LYOptions.c:2372
 msgid "Files first"
 msgstr ""
 
-#: src/LYOptions.c:2355
+#: src/LYOptions.c:2373
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2363 src/LYOptions.c:2383
+#: src/LYOptions.c:2381 src/LYOptions.c:2401
 msgid "By Name"
 msgstr ""
 
-#: src/LYOptions.c:2364 src/LYOptions.c:2384
+#: src/LYOptions.c:2382 src/LYOptions.c:2402
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2365 src/LYOptions.c:2385
+#: src/LYOptions.c:2383 src/LYOptions.c:2403
 msgid "By Size"
 msgstr ""
 
-#: src/LYOptions.c:2366 src/LYOptions.c:2386
+#: src/LYOptions.c:2384 src/LYOptions.c:2404
 msgid "By Date"
 msgstr ""
 
-#: src/LYOptions.c:2367
+#: src/LYOptions.c:2385
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2369
+#: src/LYOptions.c:2387
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2370
+#: src/LYOptions.c:2388
 msgid "By Group"
 msgstr ""
 
-#: src/LYOptions.c:2395
+#: src/LYOptions.c:2413
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2396 src/LYOptions.c:2397
+#: src/LYOptions.c:2414 src/LYOptions.c:2415
 #, c-format
 msgid "Show %s/sec rate"
 msgstr ""
 
-#: src/LYOptions.c:2399 src/LYOptions.c:2400
+#: src/LYOptions.c:2417 src/LYOptions.c:2418
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2401 src/LYOptions.c:2402
+#: src/LYOptions.c:2419 src/LYOptions.c:2420
 #, c-format
 msgid "Show %s/sec (2-digits), ETA"
 msgstr ""
 
-#: src/LYOptions.c:2405
+#: src/LYOptions.c:2423
 msgid "Show progressbar"
 msgstr ""
 
-#: src/LYOptions.c:2417
+#: src/LYOptions.c:2435
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2418
+#: src/LYOptions.c:2436
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2419
+#: src/LYOptions.c:2437
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2420
+#: src/LYOptions.c:2438
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2421
+#: src/LYOptions.c:2439
 msgid "Accept all types"
 msgstr ""
 
-#: src/LYOptions.c:2430
+#: src/LYOptions.c:2448
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2431
+#: src/LYOptions.c:2449
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2434
+#: src/LYOptions.c:2452
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2437
+#: src/LYOptions.c:2455
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2439
+#: src/LYOptions.c:2457
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2449
+#: src/LYOptions.c:2467
 msgid "HTTP 1.0"
 msgstr ""
 
-#: src/LYOptions.c:2450
+#: src/LYOptions.c:2468
 msgid "HTTP 1.1"
 msgstr ""
 
-#: src/LYOptions.c:2813 src/LYOptions.c:2842
+#: src/LYOptions.c:2827 src/LYOptions.c:2856
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3739
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3715
+#: src/LYOptions.c:3747
 msgid "General Preferences"
 msgstr ""
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3719
+#: src/LYOptions.c:3751
 msgid "User mode"
 msgstr ""
 
 #. Editor: INPUT
-#: src/LYOptions.c:3725
+#: src/LYOptions.c:3757
 msgid "Editor"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3730
+#: src/LYOptions.c:3762
 msgid "Type of Search"
 msgstr ""
 
-#: src/LYOptions.c:3735
+#: src/LYOptions.c:3767
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3739
+#: src/LYOptions.c:3771
 msgid "Cookies"
 msgstr ""
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3753
+#: src/LYOptions.c:3785
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3792
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3765
+#: src/LYOptions.c:3797
 msgid "SSL client certificate file"
 msgstr ""
 
-#: src/LYOptions.c:3769
+#: src/LYOptions.c:3801
 msgid "SSL client key file"
 msgstr ""
 
-#: src/LYOptions.c:3775
+#: src/LYOptions.c:3807
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3779
+#: src/LYOptions.c:3811
 msgid "Keypad mode"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3785
+#: src/LYOptions.c:3817
 msgid "Emacs keys"
 msgstr ""
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3791
+#: src/LYOptions.c:3823
 msgid "VI keys"
 msgstr ""
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3798
+#: src/LYOptions.c:3830
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3810
+#: src/LYOptions.c:3842
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3824
+#: src/LYOptions.c:3856
 msgid "Display and Character Set"
 msgstr ""
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3829
+#: src/LYOptions.c:3861
 msgid "Use locale-based character set"
 msgstr ""
 
-#: src/LYOptions.c:3836
+#: src/LYOptions.c:3868
 msgid "Use HTML5 charset replacements"
 msgstr ""
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3842
+#: src/LYOptions.c:3874
 msgid "Display character set"
 msgstr ""
 
-#: src/LYOptions.c:3873
+#: src/LYOptions.c:3905
 msgid "Assumed document character set"
 msgstr ""
 
@@ -4955,216 +4964,226 @@ 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:3893
+#: src/LYOptions.c:3925
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3895
+#: src/LYOptions.c:3927
 msgid "Raw 8-bit"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:3903
+#: src/LYOptions.c:3935
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3909
+#: src/LYOptions.c:3941
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3915
+#: src/LYOptions.c:3947
 msgid "Show color"
 msgstr ""
 
 #. Color style: ON/OFF
-#: src/LYOptions.c:3940
+#: src/LYOptions.c:3972
 msgid "Color style"
 msgstr ""
 
-#: src/LYOptions.c:3949
+#: src/LYOptions.c:3981
 msgid "Default colors"
 msgstr ""
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3957
+#: src/LYOptions.c:3989
 msgid "Show cursor"
 msgstr ""
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3963
+#: src/LYOptions.c:3995
 msgid "Underline links"
 msgstr ""
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3970
+#: src/LYOptions.c:4002
 msgid "Show scrollbar"
 msgstr ""
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3977
+#: src/LYOptions.c:4009
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3983
+#: src/LYOptions.c:4015
 msgid "HTML error recovery"
 msgstr ""
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3989
+#: src/LYOptions.c:4021
 msgid "Bad HTML messages"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3995
+#: src/LYOptions.c:4027
 msgid "Show images"
 msgstr ""
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:4009
+#: src/LYOptions.c:4041
 msgid "Verbose images"
 msgstr ""
 
+#. Collapse BR Tags: ON/OFF
+#: src/LYOptions.c:4047
+msgid "Collapse BR tags"
+msgstr ""
+
+#. Trim blank lines: ON/OFF
+#: src/LYOptions.c:4053
+msgid "Trim blank lines"
+msgstr ""
+
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:4017
+#: src/LYOptions.c:4061
 msgid "Headers Transferred to Remote Servers"
 msgstr ""
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:4021
+#: src/LYOptions.c:4065
 msgid "Personal mail address"
 msgstr ""
 
-#: src/LYOptions.c:4026
+#: src/LYOptions.c:4070
 msgid "Personal name for mail"
 msgstr ""
 
-#: src/LYOptions.c:4033
+#: src/LYOptions.c:4077
 msgid "Password for anonymous ftp"
 msgstr ""
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:4039
+#: src/LYOptions.c:4083
 msgid "Preferred media type"
 msgstr ""
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:4045
+#: src/LYOptions.c:4089
 msgid "Preferred encoding"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4051
+#: src/LYOptions.c:4095
 msgid "Preferred document character set"
 msgstr ""
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:4056
+#: src/LYOptions.c:4100
 msgid "Preferred document language"
 msgstr ""
 
 #. HTTP protocol SELECT
-#: src/LYOptions.c:4061
+#: src/LYOptions.c:4105
 msgid "HTTP protocol"
 msgstr ""
 
-#: src/LYOptions.c:4068
+#: src/LYOptions.c:4112
 msgid "Send User-Agent header"
 msgstr ""
 
-#: src/LYOptions.c:4070
+#: src/LYOptions.c:4114
 msgid "User-Agent header"
 msgstr ""
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:4078
+#: src/LYOptions.c:4122
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4083
+#: src/LYOptions.c:4127
 msgid "Use Passive FTP"
 msgstr ""
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4089
+#: src/LYOptions.c:4133
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:4097
+#: src/LYOptions.c:4141
 msgid "Local directory sort criteria"
 msgstr ""
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:4103
+#: src/LYOptions.c:4147
 msgid "Local directory sort order"
 msgstr ""
 
-#: src/LYOptions.c:4112
+#: src/LYOptions.c:4156
 msgid "Show dot files"
 msgstr ""
 
-#: src/LYOptions.c:4120
+#: src/LYOptions.c:4164
 msgid "Execution links"
 msgstr ""
 
-#: src/LYOptions.c:4138
+#: src/LYOptions.c:4182
 msgid "Pause when showing message"
 msgstr ""
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:4145
+#: src/LYOptions.c:4189
 msgid "Show transfer rate"
 msgstr ""
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:4165
+#: src/LYOptions.c:4209
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:4170
+#: src/LYOptions.c:4214
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:4178
+#: src/LYOptions.c:4222
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:4181
+#: src/LYOptions.c:4225
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:4183
+#: src/LYOptions.c:4227
 msgid "Bookmarks file"
 msgstr ""
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:4190
+#: src/LYOptions.c:4234
 msgid "Auto Session"
 msgstr ""
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:4196
+#: src/LYOptions.c:4240
 msgid "Session file"
 msgstr ""
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4202
+#: src/LYOptions.c:4246
 msgid "Visited Pages"
 msgstr ""
 
-#: src/LYOptions.c:4207
+#: src/LYOptions.c:4251
 msgid "View the file "
 msgstr ""
 
@@ -5229,7 +5248,7 @@ msgstr ""
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr ""
 
-#: src/LYReadCFG.c:441
+#: src/LYReadCFG.c:437
 #, c-format
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
@@ -5240,77 +5259,77 @@ msgid ""
 "The special strings 'nocolor' or 'default', or\n"
 msgstr ""
 
-#: src/LYReadCFG.c:454
+#: src/LYReadCFG.c:450
 msgid "Offending line:"
 msgstr ""
 
-#: src/LYReadCFG.c:774
+#: src/LYReadCFG.c:764
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:781
+#: src/LYReadCFG.c:771
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:802
+#: src/LYReadCFG.c:792
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr ""
 
-#: src/LYReadCFG.c:827 src/LYReadCFG.c:839
+#: src/LYReadCFG.c:817 src/LYReadCFG.c:829
 #, c-format
 msgid ""
 "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:843
+#: src/LYReadCFG.c:833
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:939
+#: src/LYReadCFG.c:929
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr ""
 
-#: src/LYReadCFG.c:940
+#: src/LYReadCFG.c:930
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:2081
+#: src/LYReadCFG.c:2070
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2083
+#: src/LYReadCFG.c:2072
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2084
+#: src/LYReadCFG.c:2073
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2487 src/LYReadCFG.c:2500 src/LYReadCFG.c:2558
+#: src/LYReadCFG.c:2476 src/LYReadCFG.c:2489 src/LYReadCFG.c:2547
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2488 src/LYReadCFG.c:2501
+#: src/LYReadCFG.c:2477 src/LYReadCFG.c:2490
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2494 src/LYReadCFG.c:2504
+#: src/LYReadCFG.c:2483 src/LYReadCFG.c:2493
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2540
+#: src/LYReadCFG.c:2529
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2548
+#: src/LYReadCFG.c:2537
 msgid "Your primary configuration"
 msgstr ""
 
@@ -5580,33 +5599,33 @@ msgstr ""
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:1919
+#: src/LYUtils.c:1917
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2666
+#: src/LYUtils.c:2664
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3571
+#: src/LYUtils.c:3569
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3871
+#: src/LYUtils.c:3869
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3902
+#: src/LYUtils.c:3900
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3905
+#: src/LYUtils.c:3903
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5279
+#: src/LYUtils.c:5278
 msgid "Cannot find HOME directory"
 msgstr ""
 
@@ -5653,7 +5672,7 @@ msgid ""
 "Current valid characters sets are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:383
+#: src/LYrcFile.c:384
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5662,13 +5681,13 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 
-#: src/LYrcFile.c:391
+#: src/LYrcFile.c:392
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
 msgstr ""
 
-#: src/LYrcFile.c:396
+#: src/LYrcFile.c:397
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5679,13 +5698,13 @@ msgid ""
 "querying the user for an invalid path or domain.\n"
 msgstr ""
 
-#: src/LYrcFile.c:410
+#: src/LYrcFile.c:411
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
 msgstr ""
 
-#: src/LYrcFile.c:415
+#: src/LYrcFile.c:416
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5693,7 +5712,7 @@ msgid ""
 "\"DIRECTORIES_FIRST\" lists directories first.\n"
 msgstr ""
 
-#: src/LYrcFile.c:423
+#: src/LYrcFile.c:424
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5701,7 +5720,7 @@ msgid ""
 "will be enabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:429
+#: src/LYrcFile.c:430
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5709,7 +5728,7 @@ msgid ""
 "will be used for sending mail.\n"
 msgstr ""
 
-#: src/LYrcFile.c:436
+#: src/LYrcFile.c:437
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5719,7 +5738,7 @@ msgid ""
 "   BY_DATE     -- sorts on the date of the file\n"
 msgstr ""
 
-#: src/LYrcFile.c:461
+#: src/LYrcFile.c:462
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5734,7 +5753,7 @@ msgid ""
 "Current lineedit modes are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:479
+#: src/LYrcFile.c:480
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5742,7 +5761,7 @@ msgid ""
 "We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n"
 msgstr ""
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:486
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5753,7 +5772,7 @@ msgid ""
 "your mailed comments.\n"
 msgstr ""
 
-#: src/LYrcFile.c:494
+#: src/LYrcFile.c:495
 msgid ""
 "personal_mail_name specifies your personal name, for mail.  The\n"
 "name is sent for mailed comments.  Lynx will prompt for this,\n"
@@ -5765,7 +5784,7 @@ msgid ""
 "menu, or modify this file directly.\n"
 msgstr ""
 
-#: src/LYrcFile.c:504
+#: src/LYrcFile.c:505
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5781,7 +5800,7 @@ msgid ""
 "is also allowed.\n"
 msgstr ""
 
-#: src/LYrcFile.c:520
+#: src/LYrcFile.c:521
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5790,7 +5809,7 @@ msgid ""
 "Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 
-#: src/LYrcFile.c:531
+#: src/LYrcFile.c:532
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5803,7 +5822,7 @@ msgid ""
 "          you are viewing trusted source information.\n"
 msgstr ""
 
-#: src/LYrcFile.c:542
+#: src/LYrcFile.c:543
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5819,7 +5838,7 @@ msgid ""
 "          you are viewing trusted source information.\n"
 msgstr ""
 
-#: src/LYrcFile.c:560
+#: src/LYrcFile.c:561
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5830,7 +5849,7 @@ msgid ""
 "The default can be overridden via the -popup command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:571
+#: src/LYrcFile.c:572
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5849,7 +5868,7 @@ msgid ""
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 msgstr ""
 
-#: src/LYrcFile.c:588
+#: src/LYrcFile.c:589
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5862,7 +5881,7 @@ msgid ""
 "The default can be overridden via the -show_cursor command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:599
+#: src/LYrcFile.c:600
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5871,7 +5890,7 @@ msgid ""
 "is disabled, creation of such files via Lynx also is disabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:610
+#: src/LYrcFile.c:611
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5884,7 +5903,7 @@ msgid ""
 "presented regardless of user mode.\n"
 msgstr ""
 
-#: src/LYrcFile.c:624
+#: src/LYrcFile.c:626
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -5894,14 +5913,14 @@ msgid ""
 "bottom of the screen.\n"
 msgstr ""
 
-#: src/LYrcFile.c:633
+#: src/LYrcFile.c:635
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
 "See also VERBOSE_IMAGES in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:638
+#: src/LYrcFile.c:640
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5911,13 +5930,13 @@ msgid ""
 "and the keymap display, respectively.\n"
 msgstr ""
 
-#: src/LYrcFile.c:646
+#: src/LYrcFile.c:648
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
 
-#: src/LYrcFile.c:887
+#: src/LYrcFile.c:890
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -5928,13 +5947,13 @@ msgid ""
 "regardless of whether numlock is on.\n"
 msgstr ""
 
-#: src/LYrcFile.c:896
+#: src/LYrcFile.c:899
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
 msgstr ""
 
-#: src/LYrcFile.c:900
+#: src/LYrcFile.c:903
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -5945,33 +5964,33 @@ msgid ""
 "lists and output from the list command also enumerate form inputs.\n"
 msgstr ""
 
-#: src/LYrcFile.c:909
+#: src/LYrcFile.c:912
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
 "enabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:941
+#: src/LYrcFile.c:944
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
 msgstr ""
 
-#: src/LYrcFile.c:950
+#: src/LYrcFile.c:953
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
 "checkbox:\n"
 msgstr ""
 
-#: src/LYrcFile.c:957
+#: src/LYrcFile.c:960
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
 msgstr ""
 
-#: src/LYrcFile.c:964
+#: src/LYrcFile.c:967
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' "
@@ -5979,14 +5998,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYrcFile.c:971
+#: src/LYrcFile.c:974
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
 "\n"
 msgstr ""
 
-#: src/LYrcFile.c:978
+#: src/LYrcFile.c:981
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
diff --git a/scripts/collapse-br b/scripts/collapse-br
new file mode 100755
index 0000000..a3378b5
--- /dev/null
+++ b/scripts/collapse-br
@@ -0,0 +1,162 @@
+#!/usr/bin/env perl
+# $LynxId: collapse-br,v 1.8 2017/07/04 19:35:45 tom Exp $
+# Generate a series of HTML files containing a mixture of text and <br> tags,
+# comparing dumps of those to w3m and elinks.
+
+use warnings;
+use strict;
+use diagnostics;
+
+$| = 1;
+
+use Getopt::Std;
+use File::Temp qw/ tempdir /;
+
+our ( $opt_C, $opt_T, $opt_e, $opt_l, $opt_p, $opt_t, $opt_w );
+our $tempdir = tempdir( CLEANUP => 1 );
+
+sub dumpit($$) {
+    my $prog = shift;
+    my $html = shift;
+    my $opts = "-dump";
+    $html =
+        "<html>"
+      . "<head><title>T</title></head>"
+      . "<body>$html</body>"
+      . "</html>"
+      if ($opt_t);
+    my @result;
+    if ( $prog =~ /lynx$/ ) {
+        my $name = "$tempdir/lynx.cfg";
+        $opts .= " -cfg=$name";
+        open my $fh, ">$name";
+        printf $fh "collapse_br_tags:%s\n", $opt_C ? "false" : "true";
+        printf $fh "trim_blank_lines:%s\n", $opt_T ? "false" : "true";
+        close $fh;
+    }
+    if ($opt_p) {
+        $opts .= " -stdin"       if ( $prog =~ /lynx$/ );
+        $opts .= " -force-html"  if ( $prog =~ /elinks$/ );
+        $opts .= " -T text/html" if ( $prog =~ /w3m$/ );
+        if ( open my $fh, "echo '$html' | $prog $opts |" ) {
+            @result = <$fh>;
+            close $fh;
+        }
+    }
+    else {
+        my $name = "$tempdir/foobar.html";
+        open my $fh, ">$name";
+        printf $fh "%s", $html;
+        close $fh;
+
+        $opts .= " $name";
+        if ( open my $fh, "$prog $opts |" ) {
+            @result = <$fh>;
+            close $fh;
+        }
+    }
+    for my $n ( 0 .. $#result ) {
+        chomp $result[$n];
+    }
+
+    if ( open my $fh, "echo '$html' | $prog $opts |" ) {
+        @result = <$fh>;
+        close $fh;
+        for my $n ( 0 .. $#result ) {
+            chomp $result[$n];
+        }
+    }
+    $result[0] = "OOPS" unless ( $#result >= 0 );
+    return @result;
+}
+
+sub header($) {
+    my @cols = @{ $_[0] };
+    my $text = "";
+    for my $c ( 0 .. $#cols ) {
+        $text .= sprintf "%-8s", $cols[$c];
+    }
+    printf "\t    %s\n", $text;
+}
+
+sub doit() {
+    my $length = 1;
+    my $state  = -1;
+
+    my @tokens;
+    $tokens[0] = " ";
+    $tokens[1] = "X";
+    $tokens[2] = "<br>";
+    my $tokens = $#tokens + 1;
+
+    my @progs;
+    $progs[ $#progs + 1 ] = "lynx";
+
+    $progs[ $#progs + 1 ] = "w3m"    if ($opt_w);
+    $progs[ $#progs + 1 ] = "elinks" if ($opt_e);
+    $progs[ $#progs + 1 ] = "./lynx" if ( -f "./lynx" );
+
+    while ( $length <= $opt_l ) {
+        my $bits  = "";
+        my $html  = "";
+        my $value = ++$state;
+        $length = 0;
+        while ( $value >= 0 ) {
+            my $digit  = $value % $tokens;
+            my $update = ( $value - $digit ) / $tokens;
+            last if ( ( $update <= 0 ) and ( $value <= 0 ) and $length > 0 );
+            $bits .= sprintf "%d", $digit;
+            $length++;
+            $html .= $tokens[$digit];
+            $value = $update;
+        }
+
+        # skip the non-interesting cases
+        next if ( $bits =~ /00/ );
+        next if ( $bits =~ /11/ );
+        next unless ( $bits =~ /2/ );
+        printf "%-*s '%s'\n", $opt_l, $bits, $html;
+        my @listing;
+        for my $p ( 0 .. $#progs ) {
+            my @q = &dumpit( $progs[$p], $html );
+            my $l = $p * 8;
+            for my $r ( 0 .. $#q ) {
+
+                $listing[$r] = "" unless ( $listing[$r] );
+                $listing[$r] = sprintf "%-*s", $l, $listing[$r] if ( $l > 0 );
+                $listing[$r] .= sprintf "|%s",
+                  substr( $q[$r] . "........", 0, 7 );
+            }
+        }
+        &header( \@progs );
+        for my $r ( 0 .. $#listing ) {
+            printf "\t%2d %s|\n", $r, $listing[$r];
+        }
+    }
+}
+
+sub main::HELP_MESSAGE() {
+    printf STDERR <<EOF
+Usage: $0 [options]
+
+Options:
+ -C      do not collapse BR-tags (lynx only)
+ -T      do not trim blank lines (lynx only)
+ -e      compare with elinks
+ -l NUM  generate test-cases up to this length (default: 3)
+ -p      pipe HTML to the program rather than reading a file
+ -t      add dummy title
+ -w      compare with w3m
+
+EOF
+      ;
+    exit;
+}
+
+&getopts('CTel:ptw') || main::HELP_MESSAGE;
+
+$opt_l = 3 unless ($opt_l);
+
+&doit;
+
+1;
diff --git a/src/GridText.c b/src/GridText.c
index a3abbe7..885141c 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.294 2017/02/11 00:50:00 tom Exp $
+ * $LynxId: GridText.c,v 1.302 2017/07/04 17:27:07 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -5760,11 +5760,11 @@ void HText_endAppend(HText *text)
     /*
      * Get the first line.
      */
-    if ((line_ptr = FirstHTLine(text)) != 0) {
+    if (LYtrimBlankLines && (line_ptr = FirstHTLine(text)) != 0) {
 	/*
-	 * Remove the blank lines at the end of document.
+	 * Remove blank lines at the end of the document.
 	 */
-	while (text->last_line->data[0] == '\0' && text->Lines > 2) {
+	while (text->last_line->data[0] == '\0' && text->Lines > 0) {
 	    HTLine *next_to_the_last_line = text->last_line->prev;
 
 	    CTRACE((tfp, "GridText: Removing bottom blank line: `%s'\n",
@@ -7886,7 +7886,7 @@ static int TrimmedLength(char *string)
 
     if (!HTisDocumentSource()) {
 	int adjust = result;
-	unsigned ch;
+	int ch;
 
 	while (adjust > 0) {
 	    ch = UCH(string[adjust - 1]);
@@ -13212,7 +13212,7 @@ int HText_EditTextArea(LinkInfo * form_link)
     TextAnchor *start_anchor = NULL;
     BOOLEAN firstanchor = TRUE;
 
-    char ed_offset[10];
+    char ed_offset[DigitsOf(int) + 3];
     int start_line = 0;
     int entry_line = form_link->anchor_line_num;
     int orig_cnt = 0;
diff --git a/src/HTAlert.c b/src/HTAlert.c
index aa18568..81594cf 100644
--- a/src/HTAlert.c
+++ b/src/HTAlert.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAlert.c,v 1.102 2016/11/24 23:56:05 tom Exp $
+ * $LynxId: HTAlert.c,v 1.103 2017/07/02 19:54:30 tom Exp $
  *
  *	Displaying messages and getting input for Lynx Browser
  *	==========================================================
@@ -1132,7 +1132,7 @@ int HTConfirmPostRedirect(const char *Redirecting_url, int server_status)
 		result = 303;
 		break;
 	    }
-	    /* fall through to default */
+	    /* FALLTHRU */
 
 	default:
 	    /*
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index 6f04ea0..6e729ae 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFWriter.c,v 1.111 2017/02/11 00:28:32 tom Exp $
+ * $LynxId: HTFWriter.c,v 1.113 2017/07/02 20:42:32 tom Exp $
  *
  *		FILE WRITER				HTFWrite.h
  *		===========
@@ -173,8 +173,8 @@ static void decompress_gzip(HTStream *me)
 	    }
 	    gzclose(gzfp);
 	    LYCloseTempFP(fp);
-	    CTRACE((tfp, "...decompress %ld to %ld\n",
-		    me->anchor->actual_length,
+	    CTRACE((tfp, "...decompress %" PRI_off_t " to %ld\n",
+		    CAST_off_t (me->anchor->actual_length),
 		    actual));
 	    if (success) {
 		if (rename(copied, in_name) == 0)
diff --git a/src/HTML.c b/src/HTML.c
index e74d239..c9ab939 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTML.c,v 1.168 2016/11/24 18:18:18 tom Exp $
+ * $LynxId: HTML.c,v 1.173 2017/07/04 20:05:01 tom Exp $
  *
  *		Structured stream to Rich hypertext converter
  *		============================================
@@ -1984,14 +1984,15 @@ static int HTML_start_element(HTStructured * me, int element_number,
     case HTML_BR:
 	UPDATE_STYLE;
 	CHECK_ID(HTML_GEN_ID);
-	/* Add a \r (new line) if these three conditions are true:
-	 *   1. We are not collapsing BR's, and
-	 *   2. The previous line has text on it, or
-	 *   3. This line has text on it.
-	 * Otherwise, don't do anything. -DH 980814, TD 980827
+	/* Add a \r (new line) if these conditions are true:
+	 *   * We are not collapsing BR's (and either we are not trimming
+	 *     blank lines, or the preceding line is non-empty), or
+	 *   * The current line has text on it.
+	 * Otherwise, don't do anything. -DH 19980814, TD 19980827/20170704
 	 */
 	if ((LYCollapseBRs == FALSE &&
-	     !HText_PreviousLineEmpty(me->text, FALSE)) ||
+	     (!LYtrimBlankLines ||
+	      !HText_PreviousLineEmpty(me->text, FALSE))) ||
 	    !HText_LastLineEmpty(me->text, FALSE)) {
 	    HText_setLastChar(me->text, ' ');	/* absorb white space */
 	    HText_appendCharacter(me->text, '\r');
@@ -3711,7 +3712,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		    TRANSLATE_AND_UNESCAPE_ENTITIES(&me->object_title, TRUE, FALSE);
 		    LYTrimHead(me->object_title);
 		    LYTrimTail(me->object_title);
-		    if (me->object_title == '\0') {
+		    if (*me->object_title == '\0') {
 			FREE(me->object_title);
 		    }
 		}
@@ -3729,7 +3730,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		    TRANSLATE_AND_UNESCAPE_ENTITIES(&me->object_type, TRUE, FALSE);
 		    LYTrimHead(me->object_type);
 		    LYTrimTail(me->object_type);
-		    if (me->object_type == '\0') {
+		    if (*me->object_type == '\0') {
 			FREE(me->object_type);
 		    }
 		}
@@ -3740,7 +3741,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		    TRANSLATE_AND_UNESCAPE_ENTITIES(&me->object_classid, TRUE, FALSE);
 		    LYTrimHead(me->object_classid);
 		    LYTrimTail(me->object_classid);
-		    if (me->object_classid == '\0') {
+		    if (*me->object_classid == '\0') {
 			FREE(me->object_classid);
 		    }
 		}
@@ -3762,7 +3763,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 						    FALSE);
 		    LYTrimHead(me->object_codetype);
 		    LYTrimTail(me->object_codetype);
-		    if (me->object_codetype == '\0') {
+		    if (*me->object_codetype == '\0') {
 			FREE(me->object_codetype);
 		    }
 		}
@@ -3772,7 +3773,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		    TRANSLATE_AND_UNESCAPE_ENTITIES(&me->object_name, TRUE, FALSE);
 		    LYTrimHead(me->object_name);
 		    LYTrimTail(me->object_name);
-		    if (me->object_name == '\0') {
+		    if (*me->object_name == '\0') {
 			FREE(me->object_name);
 		    }
 		}
@@ -4717,7 +4718,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 	    }
 	    CTRACE((tfp, "2.Ok, we're trying type=[%s] (present=%p)\n",
 		    NONNULL(I.type),
-		    present));
+		    (const void *) present));
 	    /* text+file don't go in here */
 	    if ((UseALTasVALUE == TRUE) ||
 		(present && present[HTML_INPUT_VALUE] &&
@@ -5067,7 +5068,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 	    && non_empty(value[HTML_TEXTAREA_ID])) {
 	    StrAllocCopy(id_string, value[HTML_TEXTAREA_ID]);
 	    TRANSLATE_AND_UNESCAPE_TO_STD(&id_string);
-	    if ((id_string != '\0') &&
+	    if ((*id_string != '\0') &&
 		(ID_A = HTAnchor_findChildAndLink(me->node_anchor,	/* Parent */
 						  id_string,	/* Tag */
 						  NULL,		/* Addresss */
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index d717786..caeac73 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCharUtils.c,v 1.129 2016/11/24 15:35:29 tom Exp $
+ * $LynxId: LYCharUtils.c,v 1.130 2017/07/02 19:54:30 tom Exp $
  *
  *  Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM
  *  ==========================================================================
@@ -1710,6 +1710,7 @@ char **LYUCFullyTranslateString(char **str,
 		break;
 #endif
 	    }
+	    /* FALLTHRU */
 
 	case S_recover:
 	    if (what == P_decimal || what == P_hex) {
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 63b73ec..28826a6 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.183 2017/03/18 21:42:48 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.184 2017/04/30 17:52:12 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -572,7 +572,7 @@ void wcurses_css(WINDOW * win, char *name,
 	if (tmpHash == NOSTYLE) {
 	    char *pclass = strrchr(name, '.');
 
-	    CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", pclass));
+	    CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", (void *) pclass));
 	    if (pclass)
 		*pclass = '\0';
 	    else
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index 0e27a76..6ee3f81 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYGlobalDefs.h,v 1.141 2015/12/18 00:35:49 tom Exp $
+ * $LynxId: LYGlobalDefs.h,v 1.142 2017/07/03 23:10:31 tom Exp $
  *
  * global variable definitions
  */
@@ -225,6 +225,7 @@ extern "C" {
     extern BOOLEAN LYinternal_flag;	/* don't need fresh copy, was internal link */
     extern BOOLEAN LYoverride_no_cache;		/* don't need fresh copy, from history */
     extern BOOLEAN LYresubmit_posts;
+    extern BOOLEAN LYtrimBlankLines;
     extern BOOLEAN LYtrimInputFields;
     extern BOOLEAN LYxhtml_parsing;
     extern BOOLEAN bold_H1;
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index b351577..5e86762 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.28 2017/04/29 12:47:15 tom Exp $
+// $LynxId: LYIcon.rc,v 1.30 2017/05/11 21:22:30 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1013
-PRODUCTVERSION 2,8,9,1013
+FILEVERSION    2,8,9,1015
+PRODUCTVERSION 2,8,9,1015
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1013"
+      VALUE "FileVersion",      "2.8.9.1015"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "�1997-2017 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1013"
+      VALUE "ProductVersion",   "2.8.9.1015"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYMain.c b/src/LYMain.c
index fcb87ba..e38ba5b 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.261 2017/04/27 22:34:12 tom Exp $
+ * $LynxId: LYMain.c,v 1.265 2017/07/03 23:31:21 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -204,6 +204,7 @@ BOOLEAN LYforce_no_cache = FALSE;
 BOOLEAN LYinternal_flag = FALSE;	/* override no-cache b/c internal link */
 BOOLEAN LYoverride_no_cache = FALSE;	/*override no-cache b/c history etc */
 BOOLEAN LYresubmit_posts = ALWAYS_RESUBMIT_POSTS;
+BOOLEAN LYtrimBlankLines = TRUE;
 BOOLEAN LYtrimInputFields = FALSE;
 BOOLEAN LYxhtml_parsing = FALSE;
 BOOLEAN bold_H1 = FALSE;
@@ -3412,6 +3413,10 @@ outputs for -source dumps"
       "=FILENAME\nread keystroke commands from the given file\n(see -cmd_log)"
    ),
 #endif
+   PARSE_SET(
+      "collapse_br_tags", 4|TOGGLE_ARG,		LYCollapseBRs,
+      "toggles collapsing of BR tags"
+   ),
 #ifdef USE_SLANG
    PARSE_FUN(
       "color",		4|FUNCTION_ARG,		color_fun,
@@ -3978,6 +3983,10 @@ bug which treated '>' as a co-terminator for\ndouble-quotes and tags"
       "traverse all http links derived from startfile"
    ),
    PARSE_SET(
+      "trim_blank_lines", 2|TOGGLE_ARG,		LYtrimBlankLines,
+      "\ntoggle trimming of leading/trailing/collapsed-br blank lines"
+   ),
+   PARSE_SET(
       "trim_input_fields", 2|SET_ARG,		LYtrimInputFields,
       "\ntrim input text/textarea fields in forms"
    ),
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index b2bfbdd..3329985 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.233 2016/11/24 19:50:02 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.235 2017/07/02 20:04:20 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -3530,7 +3530,8 @@ static char *urlencode(char *str)
 	result = malloc(strlen(str) * 3 + 1);
 	ptr = result;
 
-	assert(result);
+	if (result == NULL)
+	    outofmem(__FILE__, "urlencode");
 
 	while ((ch = UCH(*str++)) != 0) {
 	    if (ch == ' ') {
@@ -3586,7 +3587,7 @@ static BOOLEAN check_JUMP_param(char **url_template)
 	    HTInfoMsg(CANCELLED);
 	    code = FALSE;
 	    break;
-	} else if ((encoded = urlencode(input->str)) != '\0') {
+	} else if (*(encoded = urlencode(input->str)) != '\0') {
 	    int subs_at = (int) (subs - result);
 	    int fill_in = (int) strlen(encoded) - 2;
 	    size_t have = strlen(result);
@@ -7879,7 +7880,7 @@ static void HTGotoURLs_free(void)
  */
 void HTAddGotoURL(char *url)
 {
-    char *copy = NULL;
+    char *mycopy = NULL;
     char *old;
     HTList *cur;
 
@@ -7887,26 +7888,26 @@ void HTAddGotoURL(char *url)
 	return;
 
     CTRACE((tfp, "HTAddGotoURL %s\n", url));
-    StrAllocCopy(copy, url);
+    StrAllocCopy(mycopy, url);
 
     if (!Goto_URLs) {
 	Goto_URLs = HTList_new();
 #ifdef LY_FIND_LEAKS
 	atexit(HTGotoURLs_free);
 #endif
-	HTList_addObject(Goto_URLs, copy);
+	HTList_addObject(Goto_URLs, mycopy);
 	return;
     }
 
     cur = Goto_URLs;
     while (NULL != (old = (char *) HTList_nextObject(cur))) {
-	if (!strcmp(old, copy)) {
+	if (!strcmp(old, mycopy)) {
 	    HTList_removeObject(Goto_URLs, old);
 	    FREE(old);
 	    break;
 	}
     }
-    HTList_addObject(Goto_URLs, copy);
+    HTList_addObject(Goto_URLs, mycopy);
 
     return;
 }
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 8e795c5..eaee6be 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.171 2017/01/01 01:49:49 tom Exp $ */
+/* $LynxId: LYOptions.c,v 1.174 2017/07/04 20:28:05 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <HTTP.h>		/* 'reloading' flag */
@@ -2308,6 +2308,24 @@ static OptValues verbose_images_type_values[] =
     {0, 0, 0}
 };
 
+static const char *collapse_br_tags_string = RC_COLLAPSE_BR_TAGS;
+static OptValues collapse_br_tags_values[] =
+{
+	/* LYCollapseBRs variable */
+    {FALSE, N_("OFF"), "OFF"},
+    {TRUE, N_("collapse"), "ON"},
+    {0, 0, 0}
+};
+
+static const char *trim_blank_lines_string = RC_TRIM_BLANK_LINES;
+static OptValues trim_blank_lines_values[] =
+{
+	/* LYtrimBlankLines variable */
+    {FALSE, N_("OFF"), "OFF"},
+    {TRUE, N_("trim-lines"), "ON"},
+    {0, 0, 0}
+};
+
 /*
  * Bookmark Options
  */
@@ -3105,6 +3123,24 @@ int postoptions(DocInfo *newdoc)
 	    }
 	}
 
+	/* Collapse BR Tags: ON/OFF */
+	if (!strcmp(data[i].tag, collapse_br_tags_string)
+	    && GetOptValues(collapse_br_tags_values, data[i].value, &code)) {
+	    if (LYCollapseBRs != code) {
+		LYCollapseBRs = (BOOLEAN) code;
+		need_reload = TRUE;
+	    }
+	}
+
+	/* Trim Blank Lines: ON/OFF */
+	if (!strcmp(data[i].tag, trim_blank_lines_string)
+	    && GetOptValues(trim_blank_lines_values, data[i].value, &code)) {
+	    if (LYtrimBlankLines != code) {
+		LYtrimBlankLines = (BOOLEAN) code;
+		need_reload = TRUE;
+	    }
+	}
+
 	/* VI Keys: ON/OFF */
 	if (!strcmp(data[i].tag, vi_keys_string)
 	    && GetOptValues(bool_values, data[i].value, &code)) {
@@ -3794,7 +3830,7 @@ static int gen_options(char **newfile)
 	PutLabel(fp0, gettext("Line edit style"), lineedit_mode_string);
 	BeginSelect(fp0, lineedit_mode_string);
 	for (i = 0; LYEditorNames[i]; i++) {
-	    char temp[16];
+	    char temp[DigitsOf(i) + 3];
 
 	    sprintf(temp, "%d", i);
 	    PutOption(fp0, i == current_lineedit, temp, LYEditorNames[i]);
@@ -3806,7 +3842,7 @@ static int gen_options(char **newfile)
     PutLabel(fp0, gettext("Keyboard layout"), kblayout_string);
     BeginSelect(fp0, kblayout_string);
     for (i = 0; LYKbLayoutNames[i]; i++) {
-	char temp[16];
+	char temp[DigitsOf(i) + 3];
 
 	sprintf(temp, "%d", i);
 	PutOption(fp0, i == current_layout, temp, LYKbLayoutNames[i]);
@@ -3838,7 +3874,7 @@ static int gen_options(char **newfile)
     PutLabel(fp0, gettext("Display character set"), display_char_set_string);
     MaybeSelect(fp0, LYLocaleCharset, display_char_set_string);
     for (i = 0; LYchar_set_names[i]; i++) {
-	char temp[10];
+	char temp[DigitsOf(i) + 3];
 	size_t len = strlen(LYchar_set_names[i]);
 
 	if (len > cset_len)
@@ -4007,6 +4043,18 @@ static int gen_options(char **newfile)
     PutOptValues(fp0, verbose_img, verbose_images_type_values);
     EndSelect(fp0);
 
+    /* Collapse BR Tags: ON/OFF */
+    PutLabel(fp0, gettext("Collapse BR tags"), collapse_br_tags_string);
+    BeginSelect(fp0, collapse_br_tags_string);
+    PutOptValues(fp0, LYCollapseBRs, collapse_br_tags_values);
+    EndSelect(fp0);
+
+    /* Trim blank lines: ON/OFF */
+    PutLabel(fp0, gettext("Trim blank lines"), trim_blank_lines_string);
+    BeginSelect(fp0, trim_blank_lines_string);
+    PutOptValues(fp0, LYtrimBlankLines, trim_blank_lines_values);
+    EndSelect(fp0);
+
     /*
      * Headers Transferred to Remote Servers
      */
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 7524c0a..6552ae5 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.189 2016/11/24 15:35:29 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.190 2017/07/03 23:21:43 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -1740,6 +1740,7 @@ static Config_Type Config_Table [] =
 #endif
      PARSE_PRG(RC_TOUCH_PATH,           ppTOUCH),
      PARSE_SET(RC_TRACK_INTERNAL_LINKS, track_internal_links),
+     PARSE_SET(RC_TRIM_BLANK_LINES,     LYtrimBlankLines),
      PARSE_SET(RC_TRIM_INPUT_FIELDS,    LYtrimInputFields),
 #ifdef EXEC_LINKS
      PARSE_DEF(RC_TRUSTED_EXEC,         EXEC_PATH),
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 9f0ef0f..d063a17 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.267 2017/04/29 14:38:32 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.268 2017/05/10 22:11:33 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -3069,6 +3069,39 @@ static int mbcs_glyphs(char *s, int len)
 }
 
 /*
+ * Check if there are no continuation bytes in the multibyte (sub)string of
+ * length len.
+ */
+static int mbcs_valid(char *s, int len, int limit)
+{
+    int i;
+    int result = FALSE;
+
+    if (IS_UTF8_TTY) {
+	for (i = 0; s[i] && i < limit; i++) {
+	    if (!IS_UTF8_EXTRA(s[i])) {
+		if ((i + 1) == len) {
+		    result = TRUE;
+		    break;
+		}
+	    }
+	}
+    } else if (IS_CJK_TTY) {
+	for (i = 0; s[i] && i < limit; i++) {
+	    if (!is8bits(s[i])) {
+		if ((i + 1) == len) {
+		    result = TRUE;
+		    break;
+		}
+	    }
+	}
+    } else {
+	result = TRUE;
+    }
+    return result;
+}
+
+/*
  * Calculates offset in bytes of a glyph at cell position pos.
  */
 static int mbcs_skip(char *s, int pos)
@@ -3116,6 +3149,8 @@ static int cell2char(char *s, int cells)
 		    break;
 		/* the best solution is the one with the most bytes */
 		best = pos;
+		if (mbcs_valid(s, pos, len))
+		    break;
 	    }
 	}
 	if (best >= 0)
diff --git a/src/LYUtils.c b/src/LYUtils.c
index f9f4fb6..8f7dc7a 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.276 2016/11/24 15:35:29 tom Exp $
+ * $LynxId: LYUtils.c,v 1.278 2017/07/02 20:42:32 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -499,7 +499,7 @@ static BOOL show_whereis_targets(int flag,
 				 int TargetEmphasisON,
 				 int utf_flag)
 {
-    const char *Data = NULL;
+    const char *mydata = NULL;
     const char *cp;
     char *theData = NULL;
     char buffer[MAX_LINE];
@@ -551,10 +551,10 @@ static BOOL show_whereis_targets(int flag,
 	     * Recursively skip hits that end before this link, and break out
 	     * if there is no hit beyond those.  -FM
 	     */
-	    Data = theData;
+	    mydata = theData;
 	    while ((Offset < hoffset) &&
 		   ((Offset + tLen) <= hoffset)) {
-		data = (Data + tlen);
+		data = (mydata + tlen);
 		offset = (Offset + tLen);
 		if (((cp = LYno_attr_mb_strstr(data,
 					       target,
@@ -562,7 +562,7 @@ static BOOL show_whereis_targets(int flag,
 					       &HitOffset,
 					       &LenNeeded)) != NULL)
 		    && (offset + LenNeeded) < LYcols) {
-		    Data = cp;
+		    mydata = cp;
 		    Offset = (offset + HitOffset);
 		} else {
 		    goto highlight_search_done;
@@ -737,7 +737,7 @@ static BOOL show_whereis_targets(int flag,
 		 */
 		    && ((cp =
 			 LYno_attr_mb_strstr(data = SKIP_GLYPHS(utf_flag,
-								Data,
+								mydata,
 								offset - Offset),
 					     target,
 					     utf_flag, YES,
@@ -756,7 +756,7 @@ static BOOL show_whereis_targets(int flag,
 		     * Set up the data and offset for the hit, and let the code
 		     * for within hightext hits handle it.  -FM
 		     */
-		    Data = cp;
+		    mydata = cp;
 		    Offset = (offset + HitOffset);
 		    data = buffer;
 		    offset = hoffset;
@@ -937,7 +937,7 @@ static BOOL show_whereis_targets(int flag,
 		 */
 		    && ((cp =
 			 LYno_attr_mb_strstr(data = SKIP_GLYPHS(utf_flag,
-								Data,
+								mydata,
 								offset - Offset),
 					     target,
 					     utf_flag, YES,
@@ -959,7 +959,7 @@ static BOOL show_whereis_targets(int flag,
 		     */
 		    if ((HitOffset + (offset + tLen)) >= (hoffset + hLen)) {
 			offset = (HitOffset + offset);
-			data = SKIP_GLYPHS(utf_flag, Data, offset - hoffset);
+			data = SKIP_GLYPHS(utf_flag, mydata, offset - hoffset);
 			if (utf_flag) {
 			    LYrefresh();
 			}
@@ -1042,7 +1042,7 @@ static BOOL show_whereis_targets(int flag,
 			    LYstopTargetEmphasis();
 			}
 		    } else {
-			Data = cp;
+			mydata = cp;
 			Offset = (offset + HitOffset);
 			data = buffer;
 			offset = hoffset;
@@ -6066,7 +6066,7 @@ void LYRelaxFilePermissions(const char *name)
 	 */
 	mode_t save = umask(HIDE_UMASK);
 
-	mode = ((mode & 0700) | 0066) & ~save;
+	mode = (mode_t) (((mode & 0700) | 0066) & ~save);
 	(void) umask(save);
 	(void) chmod(name, mode);
     }
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index 2c39c11..e42d3f6 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYrcFile.c,v 1.96 2016/11/24 16:42:46 tom Exp $ */
+/* $LynxId: LYrcFile.c,v 1.99 2017/07/04 20:30:03 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <LYUtils.h>
@@ -380,6 +380,7 @@ correctly on your screen you may try changing to a different 8 bit\n\
 set or using the 7 bit character approximations.\n\
 Current valid characters sets are:\n\
 ")),
+    MAYBE_SET(RC_COLLAPSE_BR_TAGS,      LYCollapseBRs,      MSG_ENABLE_LYNXRC),
     PARSE_LIS(RC_COOKIE_ACCEPT_DOMAINS, LYCookieAcceptDomains, N_("\
 cookie_accept_domains and cookie_reject_domains are comma-delimited\n\
 lists of domains from which Lynx should automatically accept or reject\n\
@@ -620,6 +621,7 @@ presented regardless of user mode.\n\
 ")),
     MAYBE_FUN(RC_TAGSOUP,               get_tagsoup,        put_tagsoup,
               MSG_ENABLE_LYNXRC),
+    MAYBE_SET(RC_TRIM_BLANK_LINES,      LYtrimBlankLines,   MSG_ENABLE_LYNXRC),
     MAYBE_SET(RC_UNDERLINE_LINKS,       LYUnderlineLinks,   MSG_ENABLE_LYNXRC),
     PARSE_ENU(RC_USER_MODE,             user_mode,          tbl_user_mode, N_("\
 user_mode specifies the users level of knowledge with Lynx.  The\n\
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index 32003b6..dd2f99d 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYrcFile.h,v 1.48 2015/12/18 01:58:05 tom Exp $
+ * $LynxId: LYrcFile.h,v 1.49 2017/07/03 23:20:33 tom Exp $
  */
 #ifndef LYRCFILE_H
 #define LYRCFILE_H
@@ -257,6 +257,7 @@
 #define RC_TN3270_PATH                  "tn3270_path"
 #define RC_TOUCH_PATH                   "touch_path"
 #define RC_TRACK_INTERNAL_LINKS         "track_internal_links"
+#define RC_TRIM_BLANK_LINES             "trim_blank_lines"
 #define RC_TRIM_INPUT_FIELDS            "trim_input_fields"
 #define RC_TRUSTED_EXEC                 "trusted_exec"
 #define RC_TRUSTED_LYNXCGI              "trusted_lynxcgi"
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index 5978a86..aab358f 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.40 2015/10/08 00:26:34 Atsuhito.Kohda Exp $
+# $LynxId: makefile.in,v 1.41 2017/07/04 22:46:05 tom Exp $
 #
 # Makefile for the makeuctb and unicode tables.
 #
@@ -135,7 +135,7 @@ makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
 
 .c.i:
 	@RULE_CC@
-	@ECHO_CC@$(BUILD_CPP) -C $(CPP_OPTS) $(srcdir)/$*.c >$@
+	@ECHO_CC@$(BUILD_CPP) $(CPP_OPTS) $(srcdir)/$*.c >$@
 
 .tbl.h:
 	./$(MAKEUCTB) $(srcdir)/$*.tbl $*.h
diff --git a/src/makefile.in b/src/makefile.in
index de4cf00..a5287fb 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.74 2014/12/16 01:10:39 tom Exp $
+# $LynxId: makefile.in,v 1.75 2017/07/02 18:15:25 tom Exp $
 # template-makefile for Lynx src directory
 
 SHELL		= @CONFIG_SHELL@
@@ -104,7 +104,7 @@ all: lynx$x
 
 .c.i:
 	@RULE_CC@
-	@ECHO_CC@$(CPP) -C $(CPP_OPTS) $< >$@
+	@ECHO_CC@$(CPP) $(CPP_OPTS) $< >$@
 
 lynx$x:   message $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
 	@echo "Linking and creating Lynx executable"
diff --git a/userdefs.h b/userdefs.h
index 018f1a3..c232d4e 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.325 2017/04/29 12:47:15 tom Exp $
+ * $LynxId: userdefs.h,v 1.327 2017/05/11 21:22:30 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1442,11 +1442,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.13"
+#define LYNX_VERSION "2.8.9dev.15"
 #define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
+#define LYNX_DATE "Thu, 11 May 2017 17:22:30 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git



More information about the pkg-lynx-commits mailing list